diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2008-06-26 22:33:33 +0000 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2008-06-26 22:33:33 +0000 |
| commit | a4612ae06de1cabe84ffa97d9b994cec0d252be6 (patch) | |
| tree | e9f2325d55f3ffa25b3f804697d275771de8d5dc /nt/gmake.defs | |
| parent | 589a4b1959b3974cd3db3181ac0a71148a2098ee (diff) | |
| download | emacs-a4612ae06de1cabe84ffa97d9b994cec0d252be6.tar.gz | |
Remove unneeded -Defines in the compiler command line (MinGW and MSVC).
* nt/nmake.defs:
* nt/gmake.defs (FONT_CFLAGS): Remove.
(EMACS_EXTRA_C_FLAGS): Don't include FONT_CFLAGS.
(CFLAGS): Don't include WIN32_LEAN_AND_MEAN, _WIN32_WINNT, -D$(ARCH)
and _CRTAPI1.
(ARCH_FLAGS): Don't include _X86_.
* nt/config.nt (_WIN32_WINNT, WIN32_LEAN_AND_MEAN): Define.
* src/makefile.w32-in (LOCAL_FLAGS):
Don't include WINDOWSNT, DOS_NT and _UCHAR_T.
* src/sysdep.c (_spawnlp, _getpid):
Declare with explicit _cdecl instead of _CRTAPI1.
* src/editfns.c (Fget_internal_run_time):
Check for WINDOWSNT with #ifdef, not #if.
Diffstat (limited to 'nt/gmake.defs')
| -rw-r--r-- | nt/gmake.defs | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/nt/gmake.defs b/nt/gmake.defs index 7afbf099622..24c08595547 100644 --- a/nt/gmake.defs +++ b/nt/gmake.defs @@ -192,21 +192,13 @@ WINSPOOL = -lwinspool OLE32 = -lole32 UNISCRIBE = -lusp10 -ifdef USE_FONTBACKEND -FONT_CFLAGS = -DUSE_FONT_BACKEND=1 -else -FONT_CFLAGS = -endif - ifdef NOOPT DEBUG_CFLAGS = -DEMACSDEBUG else DEBUG_CFLAGS = endif -CFLAGS = -I. -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0400 \ - $(ARCH_CFLAGS) -D$(ARCH) -D_CRTAPI1=_cdecl \ - $(DEBUG_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS) -EMACS_EXTRA_C_FLAGS = -DUSE_CRT_DLL=1 $(FONT_CFLAGS) +CFLAGS = -I. $(ARCH_CFLAGS) $(DEBUG_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS) +EMACS_EXTRA_C_FLAGS = -DUSE_CRT_DLL=1 # see comments in allocate_heap in w32heap.c before changing any of the # -stack, -heap, or -image-base settings. @@ -272,9 +264,9 @@ endif ifeq "$(ARCH)" "i386" ifdef NOOPT -ARCH_CFLAGS = -D_X86_=1 -c $(DEBUG_FLAG) $(NOCYGWIN) +ARCH_CFLAGS = -c $(DEBUG_FLAG) $(NOCYGWIN) else -ARCH_CFLAGS = -D_X86_=1 -c $(DEBUG_FLAG) $(NOCYGWIN) $(MCPU_FLAG) -O2 \ +ARCH_CFLAGS = -c $(DEBUG_FLAG) $(NOCYGWIN) $(MCPU_FLAG) -O2 \ # -fbuiltin \ # -finline-functions \ # -fomit-frame-pointer |