Follow Glenn's lead and update format of Copyright.

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

diff --git a/nt/gmake.defs b/nt/gmake.defs
index 00ae686..018ca15 100644 (file)
--- a/nt/gmake.defs
+++ b/nt/gmake.defs
@@ -1,6 +1,6 @@
 #  -*- Makefile -*- definition file for building GNU Emacs on Windows NT.
 #  Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-#    2008 Free Software Foundation, Inc.
+#    2008, 2009 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -191,22 +191,24 @@ WINMM             = -lwinmm
 WINSPOOL       = -lwinspool
 OLE32          = -lole32
 UNISCRIBE      = -lusp10
-
-ifdef USE_FONTBACKEND
-FONT_CFLAGS    = -DUSE_FONT_BACKEND=1
-else
-FONT_CFLAGS    =
-endif
+UUID           = -luuid
 
 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) $(PROFILE_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS)
+EMACS_EXTRA_C_FLAGS = -DUSE_CRT_DLL=1
+
+ifdef PROFILE
+PROFILE_CFLAGS  = -pg
+PROFILE_LDFLAGS  = -pg
+else
+PROFILE_CFLAGS  =
+PROFILE_LDFLAGS =
+endif
+
 
 # see comments in allocate_heap in w32heap.c before changing any of the
 # -stack, -heap, or -image-base settings.
@@ -262,8 +264,8 @@ ifdef NODEBUG
 DEBUG_FLAG =
 DEBUG_LINK =
 else
-DEBUG_FLAG = -gstabs+ -g3
-DEBUG_LINK = -gstabs+ -g3
+DEBUG_FLAG = $(DEBUG_INFO)
+DEBUG_LINK = $(DEBUG_INFO)
 endif
 
 ifdef NOCYGWIN
@@ -272,9 +274,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
@@ -284,7 +286,7 @@ else
 ERROR Unknown architecture type "$(ARCH)".
 endif
 
-LINK_FLAGS     = $(ARCH_LDFLAGS) $(DEBUG_LINK) $(NOCYGWIN) $(USER_LDFLAGS)
+LINK_FLAGS     = $(ARCH_LDFLAGS) $(DEBUG_LINK) $(PROFILE_LDFLAGS) $(NOCYGWIN) $(USER_LDFLAGS)
 
 export XMFLAGS