Mercurial > hg > dmlib

diff Makefile.gen @ 285:245b15cd1919

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't link libSDL uselessly to utilities that do not actually use it. Provide a fake implementation of SDL mutexes to satisfy the requirement of having the functions around -- as these utilities do not actually use threading, it does not matter if the mutexes actually work.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 11 Oct 2012 10:07:59 +0300
parents d47e8cafaa63
children 4d053d9e6439
line wrap: on
line diff
--- a/Makefile.gen	Thu Oct 11 08:55:21 2012 +0300
+++ b/Makefile.gen	Thu Oct 11 10:07:59 2012 +0300
@@ -206,7 +206,7 @@
 CXXFLAGS=$(CFLAGS)
 
 DM_CFLAGS += $(SDL_CFLAGS)
-DM_LDFLAGS += $(LDFLAGS) $(SDL_LDFLAGS)
+DM_LDFLAGS += $(LDFLAGS)
 
 
 DMLIB_A=$(OBJPATH)dmlib.a
@@ -295,23 +295,23 @@
 
 $(BINPATH)vview$(EXEEXT): $(OBJPATH)vview.o $(DMLIB_A)
 	@echo " LINK $+"
-	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) -lSDL_ttf
+	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) -lSDL_ttf
 
 $(BINPATH)blittest$(EXEEXT): $(OBJPATH)blittest.o $(DMLIB_A)
 	@echo " LINK $+"
-	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) -lSDL_ttf
+	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) -lSDL_ttf
 
 $(BINPATH)efu$(EXEEXT): $(OBJPATH)efu.o $(DMLIB_A)
 	@echo " LINK $+"
-	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) -lSDL_ttf
+	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) -lSDL_ttf
 
 $(BINPATH)vptest$(EXEEXT): $(OBJPATH)vptest.o $(DMLIB_A)
 	@echo " LINK $+"
-	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) -lSDL_ttf
+	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS) -lSDL_ttf
 
 $(BINPATH)%test$(EXEEXT): $(OBJPATH)%test.o $(DMLIB_A)
 	@echo " LINK $+"
-	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS)
+	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) -lm
 
 $(BINPATH)packed$(EXEEXT): $(OBJPATH)packed.o $(DMLIB_A)
 	@echo " LINK $+"
@@ -319,7 +319,7 @@
 
 $(BINPATH)mod2wav$(EXEEXT): $(OBJPATH)mod2wav.o $(DMLIB_A)
 	@echo " LINK $+"
-	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS)
+	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) -lm
 
 $(BINPATH)xm2jss$(EXEEXT): $(OBJPATH)xm2jss.o $(DMLIB_A)
 	@echo " LINK $+"
@@ -335,11 +335,11 @@
 
 $(BINPATH)testpl$(EXEEXT): $(OBJPATH)testpl.o $(DMLIB_A)
 	@echo " LINK $+"
-	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS)
+	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS)
 
 $(BINPATH)ppl$(EXEEXT): $(OBJPATH)ppl.o $(DMLIB_A) pplfont.h
 	@echo " LINK $+"
-	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS)
+	@$(CC) -o $@ $(filter %.o %.a,$+) $(DM_LDFLAGS) $(SDL_LDFLAGS)
 
 
 ###