comparison src/makefile.nt @ 12453:8e4f8107dcd0

(EMACS) [win95]: Removed. (TLASTLIB): Defined. (TEMACS): Use TLASTLIB.
author Geoff Voelker <voelker@cs.washington.edu>
date Fri, 30 Jun 1995 21:14:56 +0000
parents 15c642f6c1a1
children d5df560686b2
comparison
equal deleted inserted replaced
12452:bd304be0b491 12453:8e4f8107dcd0
39 !if $(MSVCNT11) 39 !if $(MSVCNT11)
40 TRES = $(BLD)\emacs.res 40 TRES = $(BLD)\emacs.res
41 !else 41 !else
42 TRES = $(BLD)\emacs.rbj 42 TRES = $(BLD)\emacs.rbj
43 !endif 43 !endif
44 TLASTLIB = $(BLD)\lastfile.lib
44 45
45 LINK_FLAGS = $(ARCH_LDFLAGS) -stack:0x1000000 -base:0xD00000 -debug:full -debugtype:cv -machine:$(ARCH) -subsystem:console -entry:_start 46 LINK_FLAGS = $(ARCH_LDFLAGS) -stack:0x1000000 -base:0xD00000 -debug:full -debugtype:cv -machine:$(ARCH) -subsystem:console -entry:_start
46 47
47 # 48 #
48 # Split up the objects into two sets so that we don't run out of 49 # Split up the objects into two sets so that we don't run out of
71 $(BLD)\fns.obj \ 72 $(BLD)\fns.obj \
72 $(BLD)\indent.obj \ 73 $(BLD)\indent.obj \
73 $(BLD)\insdel.obj \ 74 $(BLD)\insdel.obj \
74 $(BLD)\keyboard.obj \ 75 $(BLD)\keyboard.obj \
75 $(BLD)\keymap.obj \ 76 $(BLD)\keymap.obj \
76 $(BLD)\lastfile.obj \
77 $(BLD)\lread.obj \ 77 $(BLD)\lread.obj \
78 $(BLD)\macros.obj \ 78 $(BLD)\macros.obj \
79 $(BLD)\marker.obj \ 79 $(BLD)\marker.obj \
80 $(BLD)\minibuf.obj \ 80 $(BLD)\minibuf.obj \
81 $(BLD)\mocklisp.obj 81 $(BLD)\mocklisp.obj
110 $(BLD)\region-cache.obj \ 110 $(BLD)\region-cache.obj \
111 $(BLD)\strftime.obj 111 $(BLD)\strftime.obj
112 112
113 LIBS = $(TLIB1) \ 113 LIBS = $(TLIB1) \
114 $(TLIB2) \ 114 $(TLIB2) \
115 $(TLASTLIB) \
115 $(BASE_LIBS) \ 116 $(BASE_LIBS) \
116 $(ADVAPI32) \ 117 $(ADVAPI32) \
117 user32.lib 118 user32.lib
118 119
119 # 120 #
142 # 143 #
143 # The dumped executable 144 # The dumped executable
144 # 145 #
145 emacs: $(EMACS) 146 emacs: $(EMACS)
146 $(EMACS): $(PREPARED_HEADERS) $(DOC) $(TEMACS) 147 $(EMACS): $(PREPARED_HEADERS) $(DOC) $(TEMACS)
147 !if "$(OS_TYPE)" == "win95"
148 move $(BLD)\temacs.exe $(BLD)\emacs.exe
149 !else
150 cd $(BLD) 148 cd $(BLD)
151 temacs.exe -batch -l loadup dump 149 temacs.exe -batch -l loadup dump
152 cd ..\.. 150 cd ..\..
153 !endif
154 151
155 # 152 #
156 # The undumped executable 153 # The undumped executable
157 # 154 #
158 temacs: $(BLD) $(TEMACS) 155 temacs: $(BLD) $(TEMACS)
159 $(TEMACS): $(TLIB1) $(TLIB2) $(TOBJ) $(TRES) 156 $(TEMACS): $(TLIB1) $(TLIB2) $(TLASTLIB) $(TOBJ) $(TRES)
160 $(LINK) -out:$(TEMACS) $(LINK_FLAGS) $(TOBJ) $(TRES) $(LIBS) 157 $(LINK) -out:$(TEMACS) $(LINK_FLAGS) $(TOBJ) $(TRES) $(LIBS)
161 158
162 # 159 #
163 # The resource file. NT 3.10 requires the use of cvtres; even though 160 # The resource file. NT 3.10 requires the use of cvtres; even though
164 # it is not necessary on later versions, it is still ok to use it. 161 # it is not necessary on later versions, it is still ok to use it.
174 # run out of command line space. 171 # run out of command line space.
175 # 172 #
176 $(TLIB1): $(OBJ1) 173 $(TLIB1): $(OBJ1)
177 @- $(AR) -out:$@ $** 174 @- $(AR) -out:$@ $**
178 $(TLIB2): $(OBJ2) 175 $(TLIB2): $(OBJ2)
176 @- $(AR) -out:$@ $**
177 #
178 # Place lastfile.obj in it's own library so that it can be loaded after
179 # the source libraries but before any system libraries. Doing so defines
180 # the end of Emacs' data section portably across compilers.
181 #
182 $(TLASTLIB): $(BLD)\lastfile.obj
179 @- $(AR) -out:$@ $** 183 @- $(AR) -out:$@ $**
180 184
181 # 185 #
182 # Object files. 186 # Object files.
183 # 187 #