(FONT_CFLAGS): New optional compiler flag.

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

diff --git a/nt/nmake.defs b/nt/nmake.defs
index 03ae2f8..8c8602d 100644 (file)
--- a/nt/nmake.defs
+++ b/nt/nmake.defs
@@ -1,10 +1,10 @@
 #  -*- Makefile -*- definition file for building GNU Emacs on Windows NT.\r
 #  Copyright (C) 2000, 2001, 2002, 2003, 2004,\r
-#    2005, 2006, 2007 Free Software Foundation, Inc.\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
@@ -117,6 +117,7 @@ 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
@@ -127,14 +128,21 @@ WINMM             = winmm.lib
 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    = -nologo -release -incremental:no -version:3.10 -swaprun:cd -swaprun:net setargv.obj\r
 \r