diff options
| author | Thilo Schulz <arny@ats.s.bawue.de> | 2011-08-01 11:53:59 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-10 23:11:07 +0000 |
| commit | 46901105439ae624dd49dc01098b1bd5db694363 (patch) | |
| tree | 8db50485612b1a41adf5f2b15b9acf9e0d7d8008 /Makefile | |
| parent | 6a796e62dd97beefb789dd486548f8771c2b2737 (diff) | |
Remove unneeded library dependencies with new modular renderer
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 19 |
1 files changed, 12 insertions, 7 deletions
@@ -337,7 +337,8 @@ ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu")) THREAD_LIBS=-lpthread LIBS=-ldl -lm - CLIENT_LIBS=$(SDL_LIBS) -lGL + CLIENT_LIBS=$(SDL_LIBS) + RENDERER_LIBS=-lGL ifeq ($(USE_OPENAL),1) ifneq ($(USE_OPENAL_DLOPEN),1) @@ -601,7 +602,8 @@ ifeq ($(PLATFORM),freebsd) CLIENT_LIBS = - CLIENT_LIBS += $(SDL_LIBS) -lGL + CLIENT_LIBS += $(SDL_LIBS) + RENDERER_LIBS = -lGL # optional features/libraries ifeq ($(USE_OPENAL),1) @@ -681,7 +683,8 @@ ifeq ($(PLATFORM),openbsd) CLIENT_LIBS = - CLIENT_LIBS += $(SDL_LIBS) -lGL + CLIENT_LIBS += $(SDL_LIBS) + RENDERER_LIBS = -lGL ifeq ($(USE_OPENAL),1) ifneq ($(USE_OPENAL_DLOPEN),1) @@ -752,8 +755,9 @@ ifeq ($(PLATFORM),irix64) LIBS=-ldl -lm -lgen # FIXME: The X libraries probably aren't necessary? - CLIENT_LIBS=-L/usr/X11/$(LIB) $(SDL_LIBS) -lGL \ + CLIENT_LIBS=-L/usr/X11/$(LIB) $(SDL_LIBS) \ -lX11 -lXext -lm + RENDERER_LIBS = -lGL else # ifeq IRIX @@ -819,7 +823,8 @@ ifeq ($(PLATFORM),sunos) BOTCFLAGS=-O0 - CLIENT_LIBS +=$(SDL_LIBS) -lGL -lX11 -lXext -liconv -lm + CLIENT_LIBS +=$(SDL_LIBS) -lX11 -lXext -liconv -lm + RENDERER_LIBS = -lGL else # ifeq sunos @@ -1597,12 +1602,12 @@ $(B)/tremulous$(FULLBINEXT): $(Q3OBJ) $(LIBSDLMAIN) $(B)/renderer_opengl1_$(SHLIBNAME): $(Q3ROBJ) $(Q3POBJ) $(echo_cmd) "LD $@" $(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3ROBJ) $(Q3POBJ) \ - $(THREAD_LIBS) $(LIBSDLMAIN) $(CLIENT_LIBS) $(LIBS) + $(THREAD_LIBS) $(LIBSDLMAIN) $(RENDERER_LIBS) $(LIBS) $(B)/renderer_opengl1_smp_$(SHLIBNAME): $(Q3ROBJ) $(Q3POBJ_SMP) $(echo_cmd) "LD $@" $(Q)$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(Q3ROBJ) $(Q3POBJ_SMP) \ - $(THREAD_LIBS) $(LIBSDLMAIN) $(CLIENT_LIBS) $(LIBS) + $(THREAD_LIBS) $(LIBSDLMAIN) $(RENDERER_LIBS) $(LIBS) else $(B)/tremulous$(FULLBINEXT): $(Q3OBJ) $(Q3ROBJ) $(Q3POBJ) $(LIBSDLMAIN) $(echo_cmd) "LD $@" |