HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* nt/configure.bat (enablechecking): Enable checks through src/config.h.
[bpt/emacs.git]
/
nt
/
nmake.defs
diff --git
a/nt/nmake.defs
b/nt/nmake.defs
index
412b014
..
ec6f510
100644
(file)
--- a/
nt/nmake.defs
+++ b/
nt/nmake.defs
@@
-1,6
+1,5
@@
# -*- Makefile -*- definition file for building GNU Emacs on Windows NT.
\r
# -*- Makefile -*- definition file for building GNU Emacs on Windows NT.
\r
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
\r
-# 2008, 2009, 2010 Free Software Foundation, Inc.
\r
+# Copyright (C) 2000-2012 Free Software Foundation, Inc.
\r
\r
# This file is part of GNU Emacs.
\r
\r
\r
# This file is part of GNU Emacs.
\r
\r
@@
-28,6
+27,7
@@
MAKETYPE=nmake
\r
CURDIR = $(MAKEDIR:\=/)
\r
THISDIR = $(MAKEDIR)
\r
\r
CURDIR = $(MAKEDIR:\=/)
\r
THISDIR = $(MAKEDIR)
\r
+DIRNAME =
\r
\r
ALL_DEPS = $**
\r
\r
\r
ALL_DEPS = $**
\r
\r
@@
-110,7
+110,15
@@
RC = rc
RC_OUT = -Fo
\r
RC_INCLUDE = -i
\r
\r
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
baselibs =
\r
O = obj
\r
A = lib
\r
@@
-137,17
+145,19
@@
DEBUG_CFLAGS = -DEMACSDEBUG
DEBUG_CFLAGS =
\r
!endif
\r
\r
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
\r
CFLAGS = -I. $(ARCH_CFLAGS) \
\r
- $(DEBUG_CFLAGS) $(CHECKING_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS)
\r
-EMACS_EXTRA_C_FLAGS =
\r
+ $(DEBUG_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS)
\r
+ESC_CFLAGS = -I. $(ARCH_CFLAGS) \
\r
+ $(DEBUG_CFLAGS) $(ESC_USER_CFLAGS) $(LOCAL_FLAGS)
\r
\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
\r
# see comments in allocate_heap in w32heap.c before changing any of the
\r
# -stack, -heap, or -base settings.
\r
@@
-168,7
+178,7
@@
COMPILER_TEMP_FILES = *.pdb
\r
CP = cp -f
\r
CP_DIR = cp -rf
\r
\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
ENDIF =
\r
FOREACH = for %%f in (
\r
FORVAR = %%f
\r
@@
-183,16
+193,23
@@
DEL_TREE = rm -r
!ifdef NODEBUG
\r
DEBUG_FLAG =
\r
DEBUG_LINK =
\r
!ifdef NODEBUG
\r
DEBUG_FLAG =
\r
DEBUG_LINK =
\r
+D =
\r
!else
\r
DEBUG_FLAG = -Zi
\r
!else
\r
DEBUG_FLAG = -Zi
\r
-DEBUG_LINK = -debug:full
\r
+DEBUG_LINK = -debug
\r
+D = d
\r
!endif
\r
\r
!endif
\r
\r
+# gcc-specific pragma (ignore for MSVC)
\r
+PRAGMA_SYSTEM_HEADER =
\r
+
\r
!if "$(ARCH)" == "i386"
\r
!ifdef NOOPT
\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
!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
!endif
\r
ARCH_LDFLAGS = $(SYS_LDFLAGS)
\r
\r
@@
-246,4
+263,3
@@
EXTRA_LINK = -profile
$(CC) $(CFLAGS) -Fo$(BLD)\ $<
\r
!ENDIF
\r
\r
$(CC) $(CFLAGS) -Fo$(BLD)\ $<
\r
!ENDIF
\r
\r
-# arch-tag: fefa49b0-c23c-46c7-9094-cab2a405058e
\r