[quake3-commits] r2119 - trunk

[DONOTREPLY at icculus.org]

Author: thilo
Date: 2011-08-01 09:10:35 -0400 (Mon, 01 Aug 2011)
New Revision: 2119

Modified:
   trunk/Makefile
Log:
Add patch by Zack Middleton to fix building for USE_RENDERER_DLOPEN=0


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2011-08-01 12:48:31 UTC (rev 2118)
+++ trunk/Makefile	2011-08-01 13:10:35 UTC (rev 2119)
@@ -929,7 +929,7 @@
   BASE_CFLAGS += -DUSE_INTERNAL_JPEG
   BASE_CFLAGS += -I$(JPDIR)
 else
-  CLIENT_LIBS += -ljpeg
+  RENDERER_LIBS += -ljpeg
 endif
 
 ifdef DEFAULT_BASEDIR
@@ -1714,13 +1714,13 @@
 	$(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)),)