(adjust_markers_for_delete): Fix last change.

[gnu-emacs] / src / makefile.nt

diff --git a/src/makefile.nt b/src/makefile.nt
index 65d763b4470c17be3bdf111f8f38ce20352bbe0d..059c539581dee3f4bcdca77240431214ed31ac79 100644 (file)
--- a/src/makefile.nt
+++ b/src/makefile.nt
@@ -37,6 +37,15 @@ LOCAL_FLAGS     = -Demacs=1 -DWINDOWSNT -DDOS_NT -DHAVE_CONFIG_H -I..\nt\inc
 LOCAL_FLAGS     = $(LOCAL_FLAGS) -DHAVE_NTGUI=1
 !endif
 
+# From MSVC 5.0 onwards, it seem base relocation information is not included,
+# at least in release builds.  We need to ensure the reloc info is included
+# in order to use the MSVC profiler.
+!IF ("$(_NMAKE_VER)" == "$(_NMAKE_VER_4)")
+EXTRA_LINK      =
+!ELSE
+EXTRA_LINK      = -profile
+!ENDIF
+
 EMACS           = $(BLD)\emacs.exe
 TEMACS          = $(BLD)\temacs.exe
 TEMACS_TMP      = $(BLD)\temacs.bin
@@ -61,7 +70,7 @@ TLASTLIB      = $(BLD)\lastfile.lib
 !if "$(BUILD_TYPE)" == "spd"
 LINK_FLAGS      = $(ARCH_LDFLAGS) -stack:0x00800000 -heap:0x00100000 -base:0x01000000 -debug:full -pdb:$(BLD)\temacs.pdb -machine:$(ARCH) -subsystem:$(SUBSYSTEM) -entry:_start -map:$(BLD)\temacs.map -swaprun:net -swaprun:cd
 !else
-LINK_FLAGS      = $(ARCH_LDFLAGS) -stack:0x00800000 -heap:0x00100000 -base:0x01000000 -debug:full -pdb:none -machine:$(ARCH) -subsystem:$(SUBSYSTEM) -entry:_start -map:$(BLD)\temacs.map -swaprun:net -swaprun:cd
+LINK_FLAGS      = $(ARCH_LDFLAGS) -stack:0x00800000 -heap:0x00100000 -base:0x01000000 -debug:full -debugtype:both -pdb:none -machine:$(ARCH) -subsystem:$(SUBSYSTEM) -entry:_start -map:$(BLD)\temacs.map -swaprun:net -swaprun:cd $(EXTRA_LINK)
 !endif
 
 #
@@ -175,10 +184,10 @@ all:            $(BLD) $(EMACS)
 #
 # Headers we would preprocess if we could.
 #
-PREPARED_HEADERS = config.h paths.h
+PREPARED_HEADERS = config.h epaths.h
 config.h:      ..\nt\$(CONFIG_H)
                $(CP) $** $@
-paths.h:       ..\nt\paths.h
+epaths.h:      ..\nt\paths.h
                $(CP) $** $@
 
 #
@@ -196,8 +205,7 @@ $(DOC):;    cd ..\lib-src
 emacs:          $(EMACS)
 $(EMACS):       $(PREPARED_HEADERS) $(DOC) $(TEMACS)
                cd $(BLD)
-               temacs.exe -batch -l loadup dump
-               copy temacs.map emacs.map
+               $(MAKEDIR)\$(BLD)\temacs.exe -batch -l loadup dump
                cd ..\..
 
 #
@@ -210,7 +218,6 @@ temacs:         $(BLD) $(TEMACS)
 $(TEMACS):      $(TLIB0) $(TLIB1) $(TLIB2) $(TLIBW32) $(TLASTLIB) $(TOBJ) $(TRES)
                $(LINK) -out:$(TEMACS_TMP) $(LINK_FLAGS) $(TOBJ) $(TRES) $(LIBS)
                ..\nt\$(BLD)\addsection $(TEMACS_TMP) $(TEMACS) EMHEAP 16
-               del $(TEMACS_TMP)
 
 #
 # The resource file.  NT 3.10 requires the use of cvtres; even though
@@ -245,17 +252,6 @@ $(TLIBW32):        $(WIN32OBJ)
 $(TLASTLIB):   $(BLD)\lastfile.obj
                @- $(AR) -out:$@ $**
 
-#
-# Object files.
-#
-!IF ("$(_NMAKE_VER)" == "$(_NMAKE_VER_4)")
-.c{$(BLD)}.obj:
-               $(CC) $(CFLAGS) -Fo$(OBJDIR)\i386\ $<
-!ELSE
-.c{$(BLD)}.obj::
-               $(CC) $(CFLAGS) -Fo$(OBJDIR)\i386\ $<
-!ENDIF
-
 #
 # Assuming INSTALL_DIR is defined, build and install emacs in it.
 #
@@ -267,7 +263,7 @@ install:        all
 # Maintenance
 # 
 clean:;         - $(DEL) *~ s\*~
-               - $(DEL) *.pdb config.h paths.h
+               - $(DEL) *.pdb config.h epaths.h
                - $(DEL) *.orig *.rej *.crlf
                - $(DEL) s\*.orig s\*.rej s\*.crlf
                - $(DEL_TREE) deleted
@@ -561,7 +557,7 @@ $(BLD)\filelock.obj : \
        $(EMACS_ROOT)\nt\inc\pwd.h \
        $(EMACS_ROOT)\nt\inc\sys\file.h \
        $(SRC)\lisp.h \
-       $(EMACS_ROOT)\src\paths.h \
+       $(EMACS_ROOT)\src\epaths.h \
        $(SRC)\buffer.h \
        $(SRC)\vmsdir.h \
        $(SRC)\ndir.h
@@ -737,7 +733,7 @@ $(BLD)\lread.obj : \
        $(EMACS_ROOT)\nt\inc\sys\file.h \
        $(SRC)\lisp.h \
        $(SRC)\buffer.h \
-       $(EMACS_ROOT)\src\paths.h \
+       $(EMACS_ROOT)\src\epaths.h \
        $(SRC)\commands.h \
        $(SRC)\keyboard.h \
        $(SRC)\termhooks.h \
@@ -1128,7 +1124,7 @@ $(BLD)\w32fns.obj: \
        $(SRC)\dispextern.h \
        $(SRC)\keyboard.h \
        $(SRC)\blockinput.h \
-       $(SRC)\paths.h \
+       $(SRC)\epaths.h \
        $(SRC)\w32heap.h \
        $(SRC)\termhooks.h
 
@@ -1152,6 +1148,7 @@ $(BLD)\w32term.obj: \
        $(SRC)\w32term.c \
        $(SRC)\lisp.h \
        $(SRC)\blockinput.h \
+       $(SRC)\w32heap.h \
        $(SRC)\w32term.h \
        $(SRC)\w32gui.h \
        $(SRC)\systty.h \
@@ -1207,7 +1204,7 @@ $(BLD)\w32bdf.obj: \
        $(SRC)\blockinput.h \
        $(SRC)\w32gui.h \
        $(SRC)\w32term.h \
-       $(SRC)\w32bdf.h
+       $(SRC)\w32bdf.h \
        $(SRC)\lisp.h \
        $(SRC)\w32term.h \
        $(SRC)\w32.h \