Move GC_SETJMP_WORKS, GC_MARK_STACK from src/s to configure

[gnu-emacs] / nt / nmake.defs

diff --git a/nt/nmake.defs b/nt/nmake.defs
index 4a7d93d40dd00e9406cad217fff87921eabca575..ec6f5102f4c2fd50f422eef7f1b197c09ca4854a 100644 (file)
--- a/nt/nmake.defs
+++ b/nt/nmake.defs
@@ -1,5 +1,5 @@
 #  -*- Makefile -*- definition file for building GNU Emacs on Windows NT.\r
-# Copyright (C) 2000-2011 Free Software Foundation, Inc.\r
+# Copyright (C) 2000-2012 Free Software Foundation, Inc.\r
 \r
 # This file is part of GNU Emacs.\r
 \r
@@ -27,6 +27,7 @@ MAKETYPE=nmake
 \r
 CURDIR         = $(MAKEDIR:\=/)\r
 THISDIR                = $(MAKEDIR)\r
+DIRNAME                =\r
 \r
 ALL_DEPS       = $**\r
 \r
@@ -144,16 +145,12 @@ DEBUG_CFLAGS      = -DEMACSDEBUG
 DEBUG_CFLAGS   =\r
 !endif\r
 \r
-!ifdef ENABLECHECKS\r
-CHECKING_CFLAGS        = -DENABLE_CHECKING -DXASSERTS\r
-!else\r
-CHECKING_CFLAGS        =\r
-!endif\r
+MWINDOWS        = -subsystem:windows -entry:mainCRTStartup\r
 \r
 CFLAGS          = -I. $(ARCH_CFLAGS) \\r
-                 $(DEBUG_CFLAGS) $(CHECKING_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS)\r
+                 $(DEBUG_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS)\r
 ESC_CFLAGS      = -I. $(ARCH_CFLAGS) \\r
-                 $(DEBUG_CFLAGS) $(CHECKING_CFLAGS) $(ESC_USER_CFLAGS) $(LOCAL_FLAGS)\r
+                 $(DEBUG_CFLAGS) $(ESC_USER_CFLAGS) $(LOCAL_FLAGS)\r
 \r
 #SYS_LDFLAGS   = -nologo -release -incremental:no -version:3.10 -swaprun:cd -swaprun:net setargv.obj\r
 !ifdef NOOPT\r
@@ -181,7 +178,7 @@ COMPILER_TEMP_FILES = *.pdb
 \r
 CP             = cp -f\r
 CP_DIR         = cp -rf\r
-IFNOTSAMEDIR   = if not exist ..\same-dir.tst\r
+IFNOTSAMEDIR   = if not exist ..\$(DIRNAME)_same-dir.tst\r
 ENDIF          =\r
 FOREACH                = for %%f in (\r
 FORVAR         = %%f\r
@@ -203,6 +200,9 @@ DEBUG_LINK = -debug
 D = d\r
 !endif\r
 \r
+# gcc-specific pragma (ignore for MSVC)\r
+PRAGMA_SYSTEM_HEADER =\r
+\r
 !if "$(ARCH)" == "i386"\r
 !ifdef NOOPT\r
 #ARCH_CFLAGS     = -nologo -c -Zel -W2 -H63 -Od -G3d -Zp8 $(DEBUG_FLAG)\r