From 3450d248a57ace0c57a9945748b78239de0d3581 Mon Sep 17 00:00:00 2001 From: Albert Cahalan Date: Sun, 25 May 2008 18:45:30 +0000 Subject: [PATCH] some SVG/SDL/etc. detection fixes --- Makefile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 09ff6ac3a..f6d7bd3bf 100644 --- a/Makefile +++ b/Makefile @@ -161,16 +161,16 @@ SDL_CFLAGS:=$(shell sdl-config --cflags) # SVG support (via Cairo) enabled by __SVG -NOSVGFLAG:=$(if $(SVG_LIB),__SVG,) +NOSVGFLAG:=$(if $(SVG_LIB),,-DNOSVG) # SVG support (use libcairo1) enabled by __SVG; see "make oldsvg" -OLDSVGFLAG:=$(if $(SVG_LIB),__SVG,) +OLDSVGFLAG:=$(if $(SVG_LIB),,-DOLD_SVG) # SDL Pango support enabled by ___SDLPANGO -NOPANGOFLAG:=$(if $(SDL_PANGO_LIB),___SDLPANGO,) +NOPANGOFLAG:=$(if $(SDL_PANGO_LIB),,-DNO_SDLPANGO) # Built with sound if -lSDL_Mixer worked -NOSOUNDFLAG:=$(if $(SDL_MIXER_LIB),__SOUND,) +NOSOUNDFLAG:=$(if $(SDL_MIXER_LIB),,-DNOSOUND) # The entire set of CFLAGS: @@ -186,8 +186,7 @@ CFLAGS:=$(OPTFLAGS) -W -Wall -fno-common -ffloat-store \ $(shell src/test-option.sh -Wstrict-aliasing=2) DEFS:=-DDATA_PREFIX=\"$(DATA_PREFIX)/\" \ - -D$(NOSOUNDFLAG) -D$(NOSVGFLAG) -D$(OLDSVGFLAG) \ - -D$(NOPANGOFLAG) \ + $(NOSOUNDFLAG) $(NOSVGFLAG) $(OLDSVGFLAG) $(NOPANGOFLAG) \ -DDOC_PREFIX=\"$(DOC_PREFIX)/\" \ -DLOCALEDIR=\"$(LOCALE_PREFIX)/\" -DIMDIR=\"$(IM_PREFIX)/\" \ -DCONFDIR=\"$(CONFDIR)/\" \