Mercurial > hg > dmlib

changeset 840:a9d0d35476ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add flag variables for SDL_ttf.
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 13 Jul 2014 23:56:55 +0300
parents 9fb3a6a39930
children dd35d66c3714
files Makefile Makefile.gen Makefile.w32
diffstat 3 files changed, 11 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Sun Jul 13 23:32:38 2014 +0300
+++ b/Makefile	Sun Jul 13 23:56:55 2014 +0300
@@ -4,6 +4,9 @@
 SDL_CFLAGS=`sdl-config --cflags`
 SDL_LDFLAGS=`sdl-config --static-libs`
 
+SDL_TTF_CFLAGS=
+SDL_TTF_LDFLAGS=-lSDL_ttf
+
 TREMOR_CFLAGS=-I/usr/local/lib/
 TREMOR_LDFLAGS=/usr/local/lib/libvorbisidec.a /usr/lib/i386-linux-gnu/libogg.a
 
--- a/Makefile.gen	Sun Jul 13 23:32:38 2014 +0300
+++ b/Makefile.gen	Sun Jul 13 23:56:55 2014 +0300
@@ -409,15 +409,15 @@
 ###
 $(TESTS_BINPATH)blittest$(EXEEXT): $(OBJPATH)blittest.o $(DMLIB_A)
 	@echo " LINK $+"
-	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) -lSDL_ttf
+	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) $(SDL_TTF_LDFLAGS)
 
 $(TESTS_BINPATH)efu$(EXEEXT): $(OBJPATH)efu.o $(DMLIB_A)
 	@echo " LINK $+"
-	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) -lSDL_ttf
+	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) $(SDL_TTF_LDFLAGS)
 
 $(TESTS_BINPATH)vptest$(EXEEXT): $(OBJPATH)vptest.o $(DMLIB_A)
 	@echo " LINK $+"
-	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) -lSDL_ttf
+	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) $(SDL_TTF_LDFLAGS)
 
 $(TESTS_BINPATH)evaltest$(EXEEXT): $(OBJPATH)evaltest.o $(OBJPATH)dmeval.o $(OBJPATH)dmevalw.o $(DMLIB_A)
 	@echo " LINK $+"
@@ -437,7 +437,7 @@
 ###
 $(TOOL_BINPATH)fontconv$(EXEEXT): $(OBJPATH)fontconv.o $(DMLIB_A)
 	@echo " LINK $+"
-	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) -lSDL_ttf
+	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) $(SDL_TTF_LDFLAGS)
 
 $(TOOL_BINPATH)data2inc$(EXEEXT): $(OBJPATH)data2inc.o $(DMLIB_A)
 	@echo " LINK $+"
@@ -481,7 +481,7 @@
 
 $(TOOL_BINPATH)auval$(EXEEXT): $(OBJPATH)auval.o $(OBJPATH)dmeval.o $(OBJPATH)dmevalw.o $(DMLIB_A)
 	@echo " LINK $+"
-	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) -lSDL_ttf
+	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) $(SDL_TTF_LDFLAGS)
 
 
 ###
--- a/Makefile.w32	Sun Jul 13 23:32:38 2014 +0300
+++ b/Makefile.w32	Sun Jul 13 23:56:55 2014 +0300
@@ -18,6 +18,9 @@
 SDL_CFLAGS=`$(MINGW_PATH)/bin/sdl-config --cflags`
 SDL_LDFLAGS=`$(MINGW_PATH)/bin/sdl-config --libs` -lSDL -L$(BINPATH)
 
+SDL_TTF_CFLAGS=
+SDL_TTF_LDFLAGS=-lSDL_ttf
+
 TREMOR_CFLAGS=-I$(MINGW_PATH)/include/tremor
 TREMOR_LDFLAGS=$(MINGW_PATH)/lib/libvorbisidec.a  $(MINGW_PATH)/lib/libogg.a