mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-30 08:09:04 +00:00
Code Issues Releases Activity

(FONT_CFLAGS): New optional compiler flag.

Browse Source 
(EMACS_EXTRA_C_FLAGS): Include it.
This commit is contained in:
Jason Rumney 2008-03-04 18:00:52 +00:00
parent 2aec15a416
commit 12cc4d8f41
3 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nt/ChangeLog
View File

@ -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.

12
nt/gmake.defs
View File

@ -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.

13
nt/nmake.defs
View File

@ -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