(MSVCNT11): Conditionally define it.

(BASE_LIBS): Do not use oldnames.lib.
(SYS_LDFLAGS): Use pdb files.
(CFLAGS_COMMON) [!spd]: Define EMACSDEBUG.
(ARCH_CFLAGS) [i386 && spd]: Use space optimizations.
(ARCH_CFLAGS) [alpha && spd]: Use optimizations.

1 files changed, 14 insertions, 4 deletions

diff --git a/nt/makefile.def b/nt/makefile.def
index 8d920d48ef0..c050b37b2af 100644
--- a/nt/makefile.def
+++ b/nt/makefile.def
@@ -34,7 +34,9 @@ INSTALL_DIR     = C:\emacs
 
 # Define MSVCNT11 to be nonzero if you are using the MSVCNT 1.1 environment.
 # MSVCNT11      = 1
+!ifndef MSVCNT11
 MSVCNT11        = 0
+!endif
 
 #
 # END CONFIGURATION
@@ -119,18 +121,22 @@ libc		= libc.lib
 !if $(MSVCNT11)
 BASE_LIBS       = $(libc) $(baselibs) oldnames.lib
 !else
-BASE_LIBS       = $(libc) $(baselibs)
+BASE_LIBS       = $(libc) $(baselibs) -nodefaultlib:oldnames.lib
 !endif
 
 # We want any debugging info in the executable.
 !if "$(LINK)" == "link32"
 SYS_LDFLAGS     = 
 !else
-SYS_LDFLAGS     = -pdb:none -release -incremental:no -version:3.10
+SYS_LDFLAGS     = -release -incremental:no -version:3.10
 !endif
 
 INC             = -I.
+!if "$(BUILD_TYPE)" == "spd"
 CFLAGS_COMMON   = -nologo $(INC) $(ARCH_CFLAGS) $(LOCAL_FLAGS) -DWIN32_LEAN_AND_MEAN -D$(ARCH)
+!else
+CFLAGS_COMMON   = -nologo $(INC) $(ARCH_CFLAGS) $(LOCAL_FLAGS) -DWIN32_LEAN_AND_MEAN -D$(ARCH) -DEMACSDEBUG
+!endif
 !if $(MSVCNT11)
 CFLAGS          = $(CFLAGS_COMMON) -D_CRTAPI1=_cdecl
 !else
@@ -170,7 +176,7 @@ ADDPM		= ..\nt\$(BLD)\addpm.exe
 
 !if "$(ARCH)" == "i386"
 !if "$(BUILD_TYPE)" == "spd"
-ARCH_CFLAGS     = -nologo -D_X86_=1 -c -Zel -W2 -H63 -O2b2 -G5d -Zi
+ARCH_CFLAGS     = -nologo -D_X86_=1 -c -Zel -W2 -H63 -Oxsb2 -G5dF -Zi
 !else
 ARCH_CFLAGS     = -nologo -D_X86_=1 -c -Zel -W2 -H63 -G3d -Zi -Od
 !endif
@@ -183,7 +189,11 @@ ARCH_LDFLAGS	= -align:0x1000 $(SYS_LDFLAGS)
 
 !else
 !if "$(ARCH)" == "alpha"
-ARCH_CFLAGS     = -D_ALPHA_=1 -c -Ze -Zi -W2 -D__stdcall= -D__cdecl=
+!if "$(BUILD_TYPE)" == "spd"
+ARCH_CFLAGS     = -D_ALPHA_=1 -c -Ze -Zi -W2 -Od -D__stdcall= -D__cdecl=
+!else
+ARCH_CFLAGS     = -D_ALPHA_=1 -c -Ze -Zi -W2 -O1 -D__stdcall= -D__cdecl=
+!endif
 ARCH_LDFLAGS    = -align:0x2000 $(SYS_LDFLAGS)
 
 !else