Mercurial > hg > dmlib
changeset 285:245b15cd1919
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 | a17e54015bd9 |
| files | Makefile.gen dmmutex.h mod2wav.c packed.c viewmod.c xm2jss.c |
| diffstat | 6 files changed, 42 insertions(+), 9 deletions(-) [+] |
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) ###
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/dmmutex.h Thu Oct 11 10:07:59 2012 +0300 @@ -0,0 +1,28 @@ +/* + * DMLib + * -- Bogus implementations of SDL mutex functions + * Programmed and designed by Matti 'ccr' Hamalainen + * (C) Copyright 2012 Tecnic Software productions (TNSP) + */ + +int SDL_mutexP(DMMutex *p) +{ + (void) p; + return 0; +} + +int SDL_mutexV(DMMutex *p) +{ + (void) p; + return 0; +} + +DMMutex * SDL_CreateMutex() +{ + return NULL; +} + +void SDL_DestroyMutex(DMMutex *p) +{ + (void) p; +}
--- a/mod2wav.c Thu Oct 11 08:55:21 2012 +0300 +++ b/mod2wav.c Thu Oct 11 10:07:59 2012 +0300 @@ -15,6 +15,7 @@ #include "dmlib.h" #include "dmargs.h" #include "dmwav.h" +#include "dmmutex.h" char *srcFilename = NULL, *destFilename = NULL;
--- a/packed.c Thu Oct 11 08:55:21 2012 +0300 +++ b/packed.c Thu Oct 11 10:07:59 2012 +0300 @@ -8,6 +8,7 @@ #include "dmpack.h" #include "dmpackutil.h" #include "dmres.h" +#include "dmmutex.h" #include <errno.h> #define SET_MAX_FILES (4096)
--- a/viewmod.c Thu Oct 11 08:55:21 2012 +0300 +++ b/viewmod.c Thu Oct 11 10:07:59 2012 +0300 @@ -10,6 +10,7 @@ #include <errno.h> #include <string.h> #include "dmargs.h" +#include "dmmutex.h" char *optFilename = NULL;
--- a/xm2jss.c Thu Oct 11 08:55:21 2012 +0300 +++ b/xm2jss.c Thu Oct 11 10:07:59 2012 +0300 @@ -13,6 +13,8 @@ #include "dmlib.h" #include "dmargs.h" #include "dmres.h" +#include "dmmutex.h" + #define jmpNMODEffectTable (36) static const char jmpMODEffectTable[jmpNMODEffectTable] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";