From 83f228a42fa239eec0c57c5912f84209f1ef2971 Mon Sep 17 00:00:00 2001 From: Thilo Schulz Date: Mon, 1 Aug 2011 13:10:35 +0000 Subject: [PATCH] Add patch by Zack Middleton to fix building for USE_RENDERER_DLOPEN=0 --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index f13a9b5a..dfa1f82b 100644 --- a/Makefile +++ b/Makefile @@ -929,7 +929,7 @@ ifeq ($(USE_INTERNAL_JPEG),1) BASE_CFLAGS += -DUSE_INTERNAL_JPEG BASE_CFLAGS += -I$(JPDIR) else - CLIENT_LIBS += -ljpeg + RENDERER_LIBS += -ljpeg endif ifdef DEFAULT_BASEDIR @@ -1714,13 +1714,13 @@ $(B)/ioquake3$(FULLBINEXT): $(Q3OBJ) $(Q3ROBJ) $(Q3POBJ) $(LIBSDLMAIN) $(echo_cmd) "LD $@" $(Q)$(CC) $(CLIENT_CFLAGS) $(CFLAGS) $(CLIENT_LDFLAGS) $(LDFLAGS) \ -o $@ $(Q3OBJ) $(Q3ROBJ) $(Q3POBJ) \ - $(LIBSDLMAIN) $(CLIENT_LIBS) $(LIBS) + $(LIBSDLMAIN) $(CLIENT_LIBS) $(RENDERER_LIBS) $(LIBS) $(B)/ioquake3-smp$(FULLBINEXT): $(Q3OBJ) $(Q3ROBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN) $(echo_cmd) "LD $@" $(Q)$(CC) $(CLIENT_CFLAGS) $(CFLAGS) $(CLIENT_LDFLAGS) $(LDFLAGS) $(THREAD_LDFLAGS) \ -o $@ $(Q3OBJ) $(Q3ROBJ) $(Q3POBJ_SMP) \ - $(THREAD_LIBS) $(LIBSDLMAIN) $(CLIENT_LIBS) $(LIBS) + $(THREAD_LIBS) $(LIBSDLMAIN) $(CLIENT_LIBS) $(RENDERER_LIBS) $(LIBS) endif ifneq ($(strip $(LIBSDLMAIN)),)