(FONT_CFLAGS): New optional compiler flag.

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

diff --git a/nt/nmake.defs b/nt/nmake.defs
index f18b9e0..8c8602d 100644 (file)
--- a/nt/nmake.defs
+++ b/nt/nmake.defs
@@ -1,10 +1,10 @@
-#\r
-#  Makefile definition file for building GNU Emacs on the Microsoft W32 API.\r
-#  Copyright (c) 2000-2001 Free Software Foundation, Inc.\r
+#  -*- Makefile -*- definition file for building GNU Emacs on Windows NT.\r
+#  Copyright (C) 2000, 2001, 2002, 2003, 2004,\r
+#    2005, 2006, 2007, 2008 Free Software Foundation, Inc.\r
 #\r
 #  GNU Emacs is free software; you can redistribute it and/or modify\r
 #  it under the terms of the GNU General Public License as published by\r
-#  the Free Software Foundation; either version 2, or (at your option)\r
+#  the Free Software Foundation; either version 3, or (at your option)\r
 #  any later version.\r
 #\r
 #  GNU Emacs is distributed in the hope that it will be useful,\r
@@ -14,8 +14,8 @@
 #\r
 #  You should have received a copy of the GNU General Public License\r
 #  along with GNU Emacs; see the file COPYING.  If not, write to\r
-#  the Free Software Foundation, Inc., 59 Temple Place - Suite 330,\r
-#  Boston, MA 02111-1307, USA.\r
+#  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,\r
+#  Boston, MA 02110-1301, USA.\r
 \r
 # Ensure 'all' is the default target\r
 all:\r
@@ -117,28 +117,38 @@ A         = lib
 BASE_LIBS      = $(libc) $(baselibs) oldnames.lib\r
 \r
 ADVAPI32       = advapi32.lib\r
+COMCTL32       = comctl32.lib\r
 COMDLG32       = comdlg32.lib\r
 GDI32          = gdi32.lib\r
 MPR            = mpr.lib\r
 SHELL32                = shell32.lib\r
 USER32         = user32.lib\r
 WSOCK32                = wsock32.lib\r
-WINMM     = winmm.lib\r
+WINMM          = winmm.lib\r
+WINSPOOL       = winspool.lib\r
+OLE32          = ole32.lib\r
+\r
+!ifdef USE_FONTBACKEND\r
+FONT_CFLAGS    = -DUSE_FONT_BACKEND=1\r
+!else\r
+FONT_CFLAGS    =\r
+!endif\r
 \r
 !ifdef NOOPT\r
 DEBUG_CFLAGS   = -DEMACSDEBUG\r
 !else\r
 DEBUG_CFLAGS   =\r
 !endif\r
-CFLAGS          = -I. -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0400 $(ARCH_CFLAGS) -D$(ARCH) \\r
-                 -D_CRTAPI1=_cdecl $(DEBUG_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS)\r
-EMACS_EXTRA_C_FLAGS =\r
+CFLAGS          = -I. -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0400 \\r
+                 $(ARCH_CFLAGS) -D$(ARCH) -D_CRTAPI1=_cdecl \\r
+                 $(DEBUG_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS)\r
+EMACS_EXTRA_C_FLAGS = $(FONT_CFLAGS)\r
 \r
-SYS_LDFLAGS    = -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
 \r
 # see comments in allocate_heap in w32heap.c before changing any of the\r
 # -stack, -heap, or -base settings.\r
-TEMACS_EXTRA_LINK = -stack:0x00800000 -heap:0x00100000 -base:0x01000000 -debug:full -debugtype:both -pdb:$(BLD)\temacs.pdb -machine:$(ARCH) $(SUBSYSTEM_CONSOLE) -entry:_start -map:$(BLD)\temacs.map $(EXTRA_LINK)\r
+TEMACS_EXTRA_LINK = -stack:0x00800000 -heap:0x00100000 -base:0x01000000 -pdb:$(BLD)\temacs.pdb -machine:$(ARCH) $(SUBSYSTEM_CONSOLE) -entry:_start -map:$(BLD)\temacs.map $(EXTRA_LINK)\r
 \r
 !ifdef NOOPT\r
 OBJDIR          = obj\r
@@ -147,8 +157,9 @@ OBJDIR          = obj-spd
 !endif\r
 $(OBJDIR):;    -mkdir $(OBJDIR)\r
 BLD             = $(OBJDIR)/$(ARCH)\r
-$(BLD):         $(OBJDIR)\r
+stamp_BLD:      $(OBJDIR)\r
                -mkdir "$(BLD)"\r
+               echo $(BLD) > $@\r
 \r
 COMPILER_TEMP_FILES = *.pdb\r
 \r
@@ -161,6 +172,7 @@ FORVAR              = %%f
 FORDO          = ) do\r
 ENDFOR         =\r
 ARGQUOTE       = "\r
+# "\r
 DQUOTE         = \"\r
 DEL            = rm\r
 DEL_TREE       = rm -r\r
@@ -170,7 +182,7 @@ DEBUG_FLAG =
 DEBUG_LINK =\r
 !else\r
 DEBUG_FLAG = -Zi\r
-DEBUG_LINK = -debug:full -debugtype:both\r
+DEBUG_LINK = -debug:full\r
 !endif\r
 \r
 !if "$(ARCH)" == "i386"\r