Mercurial > emacs

changeset 12237:f5ad41d728d3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(MSVCNT11): Defined. (BASE_LIBS) [MSVCNT11]: Use oldnames.lib. (CFLAGS_COMMON): Defined. (CFLAGS) [MSVCNT11]: Define _CRTAPI1 to _cdecl.
author Richard M. Stallman <rms@gnu.org>
date Thu, 15 Jun 1995 15:28:03 +0000
parents 791ee9839187
children f442c22815b8
files nt/makefile.def
diffstat 1 files changed, 14 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/nt/makefile.def	Thu Jun 15 15:27:42 1995 +0000
+++ b/nt/makefile.def	Thu Jun 15 15:28:03 1995 +0000
@@ -27,6 +27,10 @@
 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 +111,11 @@
 
 # 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 +125,12 @@
 !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
 
 OBJDIR          = obj
 $(OBJDIR):;	-mkdir $(OBJDIR)