Support MSVC build with newer versions of Visual Studio.

[bpt/emacs.git] / nt / nmake.defs

diff --git a/nt/nmake.defs b/nt/nmake.defs
index 6c0922d..4a7d93d 100644 (file)
--- a/nt/nmake.defs
+++ b/nt/nmake.defs
@@ -109,7 +109,15 @@ RC         = rc
 RC_OUT         = -Fo\r
 RC_INCLUDE     = -i\r
 \r
-libc           = libc.lib\r
+USE_CRT_DLL    = 1\r
+\r
+!ifdef USE_CRT_DLL\r
+libc           = msvcrt$(D).lib\r
+EMACS_EXTRA_C_FLAGS= -D_DLL -D_MT -DUSE_CRT_DLL=1\r
+!else\r
+libc           = libcmt$(D).lib\r
+EMACS_EXTRA_C_FLAGS= -D_MT\r
+!endif\r
 baselibs       =\r
 O              = obj\r
 A              = lib\r
@@ -146,9 +154,13 @@ CFLAGS          = -I. $(ARCH_CFLAGS) \
                  $(DEBUG_CFLAGS) $(CHECKING_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS)\r
 ESC_CFLAGS      = -I. $(ARCH_CFLAGS) \\r
                  $(DEBUG_CFLAGS) $(CHECKING_CFLAGS) $(ESC_USER_CFLAGS) $(LOCAL_FLAGS)\r
-EMACS_EXTRA_C_FLAGS =\r
 \r
-SYS_LDFLAGS    = -nologo -release -incremental:no -version:3.10 -swaprun:cd -swaprun:net setargv.obj\r
+#SYS_LDFLAGS   = -nologo -release -incremental:no -version:3.10 -swaprun:cd -swaprun:net setargv.obj\r
+!ifdef NOOPT\r
+SYS_LDFLAGS    = -nologo -manifest -dynamicbase:no -debug -incremental:no -version:3.10 -swaprun:cd -swaprun:net setargv.obj\r
+!else\r
+SYS_LDFLAGS    = -nologo -manifest -dynamicbase:no -release -incremental:no -version:3.10 -swaprun:cd -swaprun:net setargv.obj\r
+!endif\r
 \r
 # see comments in allocate_heap in w32heap.c before changing any of the\r
 # -stack, -heap, or -base settings.\r
@@ -184,16 +196,20 @@ DEL_TREE  = rm -r
 !ifdef NODEBUG\r
 DEBUG_FLAG =\r
 DEBUG_LINK =\r
+D =\r
 !else\r
 DEBUG_FLAG = -Zi\r
-DEBUG_LINK = -debug:full\r
+DEBUG_LINK = -debug\r
+D = d\r
 !endif\r
 \r
 !if "$(ARCH)" == "i386"\r
 !ifdef NOOPT\r
-ARCH_CFLAGS     = -nologo -c -Zel -W2 -H63 -Od -G3d -Zp8 $(DEBUG_FLAG)\r
+#ARCH_CFLAGS     = -nologo -c -Zel -W2 -H63 -Od -G3d -Zp8 $(DEBUG_FLAG)\r
+ARCH_CFLAGS     = -nologo -D_X86_=1 -c -Zl -Zp8 -W2 -Od -Gd $(DEBUG_FLAG)\r
 !else\r
-ARCH_CFLAGS     = -nologo -c -Zel -W2 -H63 -Oxsb2 -Oy- -G6dF -Zp8 $(DEBUG_FLAG)\r
+#ARCH_CFLAGS     = -nologo -c -Zel -W2 -H63 -Oxsb2 -Oy- -G6dF -Zp8 $(DEBUG_FLAG)\r
+ARCH_CFLAGS     = -nologo -D_X86_=1 -c -Zl -Zp8 -W2 -Oi -Ot -Oy- -Ob2 -GF -Gy -Gd $(DEBUG_FLAG)\r
 !endif\r
 ARCH_LDFLAGS   = $(SYS_LDFLAGS)\r
 \r