diff options
| author | Jason Rumney <jasonr@gnu.org> | 2008-03-04 18:00:52 +0000 |
|---|---|---|
| committer | Jason Rumney <jasonr@gnu.org> | 2008-03-04 18:00:52 +0000 |
| commit | 12cc4d8f4129ede99a2cb3d1bd0bef9a6333cace (patch) | |
| tree | 4bebda6e465a2636f46d9cc40db4268305d99135 /nt | |
| parent | 2aec15a416e8a4811c630c9189b9c0f2410097ff (diff) | |
| download | emacs-12cc4d8f4129ede99a2cb3d1bd0bef9a6333cace.tar.gz | |
(FONT_CFLAGS): New optional compiler flag.
(EMACS_EXTRA_C_FLAGS): Include it.
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/ChangeLog | 8 | ||||
| -rw-r--r-- | nt/gmake.defs | 12 | ||||
| -rw-r--r-- | nt/nmake.defs | 13 |
3 files changed, 27 insertions, 6 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index a3d5a951318..fd5a489d679 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,11 @@ +2008-03-04 Jason Rumney <jasonr@gnu.org> + + * gmake.defs, nmake.defs (FONT_CFLAGS): New optional compiler flag. + (EMACS_EXTRA_C_FLAGS): Include it. + * configure.bat (usefontbackend): Default to Y. + (--enable-font-backend): Replace with --disable-font-backend. + (:withfont): Replace with :withoutfont. + 2008-03-03 Kentaro Ohkouchi <nanasess@fsm.ne.jp> * icons/emacs.ico: Full alpha for 32x32 full color. diff --git a/nt/gmake.defs b/nt/gmake.defs index 6bc5e247886..f6c0cb14493 100644 --- a/nt/gmake.defs +++ b/nt/gmake.defs @@ -191,15 +191,21 @@ WINMM = -lwinmm WINSPOOL = -lwinspool OLE32 = -lole32 +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 \ +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 +EMACS_EXTRA_C_FLAGS = -DUSE_CRT_DLL=1 $(FONT_CFLAGS) # see comments in allocate_heap in w32heap.c before changing any of the # -stack, -heap, or -image-base settings. diff --git a/nt/nmake.defs b/nt/nmake.defs index 503d8ec140f..8c8602de58b 100644 --- a/nt/nmake.defs +++ b/nt/nmake.defs @@ -128,14 +128,21 @@ WINMM = winmm.lib WINSPOOL = winspool.lib
OLE32 = ole32.lib
+!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 =
+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 = $(FONT_CFLAGS)
SYS_LDFLAGS = -nologo -release -incremental:no -version:3.10 -swaprun:cd -swaprun:net setargv.obj
|