Skip to content

Commit

Permalink
Remove unneeded library dependencies with new modular renderer
Browse files Browse the repository at this point in the history
  • Loading branch information
Thilo Schulz committed Aug 1, 2011
1 parent eb9fe03 commit b151d91
Showing 1 changed file with 12 additions and 7 deletions.
19 changes: 12 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,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)
Expand Down Expand Up @@ -612,7 +613,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)
Expand Down Expand Up @@ -692,7 +694,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)
Expand Down Expand Up @@ -763,8 +766,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

Expand Down Expand Up @@ -830,7 +834,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

Expand Down Expand Up @@ -1708,12 +1713,12 @@ $(B)/ioquake3$(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)/ioquake3$(FULLBINEXT): $(Q3OBJ) $(Q3ROBJ) $(Q3POBJ) $(LIBSDLMAIN)
$(echo_cmd) "LD $@"
Expand Down

0 comments on commit b151d91

Please sign in to comment.