(Choosing Window, Displaying Buffers): Fix last changes.

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

diff --git a/nt/nmake.defs b/nt/nmake.defs
index 7c6a518..1303445 100644 (file)
--- a/nt/nmake.defs
+++ b/nt/nmake.defs
@@ -130,21 +130,14 @@ WINSPOOL  = winspool.lib
 OLE32          = ole32.lib\r
 UNISCRIBE      = usp10.lib\r
 \r
-!ifdef USE_FONTBACKEND\r
-FONT_CFLAGS    = -DUSE_FONT_BACKEND=1\r
-!else\r
-FONT_CFLAGS    =\r
-!endif\r
-\r
 !ifdef NOOPT\r
 DEBUG_CFLAGS   = -DEMACSDEBUG\r
 !else\r
 DEBUG_CFLAGS   =\r
 !endif\r
-CFLAGS          = -I. -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0400 \\r
-                 $(ARCH_CFLAGS) -D$(ARCH) -D_CRTAPI1=_cdecl \\r
+CFLAGS          = -I. $(ARCH_CFLAGS) \\r
                  $(DEBUG_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS)\r
-EMACS_EXTRA_C_FLAGS = $(FONT_CFLAGS)\r
+EMACS_EXTRA_C_FLAGS =\r
 \r
 SYS_LDFLAGS    = -nologo -release -incremental:no -version:3.10 -swaprun:cd -swaprun:net setargv.obj\r
 \r
@@ -189,9 +182,9 @@ DEBUG_LINK = -debug:full
 \r
 !if "$(ARCH)" == "i386"\r
 !ifdef NOOPT\r
-ARCH_CFLAGS     = -nologo -D_X86_=1 -c -Zel -W2 -H63 -Od -G3d -Zp8 $(DEBUG_FLAG)\r
+ARCH_CFLAGS     = -nologo -c -Zel -W2 -H63 -Od -G3d -Zp8 $(DEBUG_FLAG)\r
 !else\r
-ARCH_CFLAGS     = -nologo -D_X86_=1 -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
 !endif\r
 ARCH_LDFLAGS   = $(SYS_LDFLAGS)\r
 \r