summaryrefslogtreecommitdiff
path: root/src/makefile.nt
diff options
context:
space:
mode:
authorGeoff Voelker <voelker@cs.washington.edu>1996-05-03 18:32:30 +0000
committerGeoff Voelker <voelker@cs.washington.edu>1996-05-03 18:32:30 +0000
commit2fd5e802b74c05dac1f6a61569fc2411d9e2e40b (patch)
tree0b3251d6ea45ad6897b2e2d4e996decd643bfc36 /src/makefile.nt
parentc911543b1c6cb0c2e40b8e2d0df98a8c7a4b0fb0 (diff)
downloademacs-2fd5e802b74c05dac1f6a61569fc2411d9e2e40b.tar.gz
(SUBSYSTEM) [NTGUI]: Remove conditional.
(LINK_FLAGS): Explicitly set base address, and stack and heap sizes. (nt.obj): Add dependency to nt.h.
Diffstat (limited to 'src/makefile.nt')
-rw-r--r--src/makefile.nt10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/makefile.nt b/src/makefile.nt
index b4fe21fb139..5aabe8398e9 100644
--- a/src/makefile.nt
+++ b/src/makefile.nt
@@ -25,11 +25,7 @@
#
!include ..\nt\makefile.def
-!IFDEF NTGUI
-SUBSYSTEM=windows
-!ELSE
SUBSYSTEM=console
-!ENDIF
#
# HAVE_CONFIG_H is required by some generic gnu sources stuck into
@@ -54,7 +50,9 @@ TRES = $(BLD)\emacs.rbj
!endif
TLASTLIB = $(BLD)\lastfile.lib
-LINK_FLAGS = $(ARCH_LDFLAGS) -stack:0x1000000 -base:0xD00000 -debug:full -debugtype:cv -machine:$(ARCH) -subsystem:$(SUBSYSTEM) -entry:_start -map:$(BLD)\temacs.map -map
+# see comments in allocate_heap in ntheap.c before changing any of the
+# -stack, -heap, or -base settings.
+LINK_FLAGS = $(ARCH_LDFLAGS) -stack:0x00800000 -heap:0x00100000 -base:0x01000000 -debug:full -debugtype:cv -machine:$(ARCH) -subsystem:$(SUBSYSTEM) -entry:_start -map:$(BLD)\temacs.map
#
# Split up the objects into two sets so that we don't run out of
@@ -139,6 +137,7 @@ LIBS = $(TLIB1) \
gdi32.lib \
comdlg32.lib \
!ENDIF
+# libcmt.lib \
$(BASE_LIBS) \
$(ADVAPI32) \
user32.lib \
@@ -730,6 +729,7 @@ $(BLD)\mocklisp.obj : \
$(BLD)\nt.obj : \
$(SRC)\nt.c \
+ $(SRC)\nt.h \
$(SRC)\s\windowsnt.h \
$(SRC)\m\intel386.h \
$(SRC)\config.h \