(x_find_modifier_meanings): Fix !X11R4 code to use dpyinfo.

[gnu-emacs] / nt / makefile.def

diff --git a/nt/makefile.def b/nt/makefile.def
index 51c572b5d0bf6b94c6847eda2b375ebf4c6a8ced..0e5dadd71aaf826d44ebbf4eef1bb21c74b16593 100644 (file)
--- a/nt/makefile.def
+++ b/nt/makefile.def
@@ -21,12 +21,20 @@
 # BEGIN CONFIGURATION
 #
 
+# Define the following to build the GUI version
+#
+NTGUI=1
+
 # Set INSTALL_DIR to be the directory into which you want emacs installed.
 #
 !ifndef INSTALL_DIR
 INSTALL_DIR     = C:\emacs
 !endif
 
+# Define MSVCNT11 to be nonzero if you are using the MSVCNT 1.1 environment.
+# MSVCNT11     = 1
+MSVCNT11        = 0
+
 #
 # END CONFIGURATION
 #
@@ -107,7 +115,11 @@ libc               = libc.lib
 
 # The base libraries for compiling Emacs on NT.  With MSVC, this should
 # include oldnames.lib.
+!if $(MSVCNT11)
+BASE_LIBS      = $(libc) $(baselibs) oldnames.lib
+!else
 BASE_LIBS      = $(libc) $(baselibs)
+!endif
 
 # We want any debugging info in the executable.
 !if "$(LINK)" == "link32"
@@ -117,7 +129,15 @@ SYS_LDFLAGS        = -pdb:none -release -incremental:no
 !endif
 
 INC             = -I.
-CFLAGS          = -nologo $(INC) $(ARCH_CFLAGS) $(LOCAL_FLAGS) -DWIN32_LEAN_AND_MEAN -D$(ARCH)
+CFLAGS_COMMON  = -nologo $(INC) $(ARCH_CFLAGS) $(LOCAL_FLAGS) -DWIN32_LEAN_AND_MEAN -D$(ARCH)
+!if $(MSVCNT11)
+CFLAGS          = $(CFLAGS_COMMON) -D_CRTAPI1=_cdecl
+!else
+CFLAGS          = $(CFLAGS_COMMON) 
+!endif
+!ifdef NTGUI
+CFLAGS          = $(CFLAGS) -DHAVE_NTGUI=1
+!endif
 
 OBJDIR          = obj
 $(OBJDIR):;    -mkdir $(OBJDIR)
@@ -126,7 +146,7 @@ $(BLD):         $(OBJDIR)
                -mkdir $(BLD)
 
 CP             = copy
-CP_DIR         = xcopy /fried
+CP_DIR         = xcopy /f/r/i/e/d
 
 # This is completely braindamaged, but it's the only routine known to be there
 DEL_TREE       = echo y | rmdir /s