diff options
| author | Thilo Schulz <arny@ats.s.bawue.de> | 2011-08-01 13:10:35 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-10 23:11:08 +0000 |
| commit | 71a61fc6baf35e8882c83586fd808ad9fc1701e5 (patch) | |
| tree | 7d23b52bd9bd21b4b58de7cabf1992314a6070f7 /Makefile | |
| parent | 0d26b7ba4825d5f26747dd6fa0d6948caeb3f39d (diff) | |
Add patch by Zack Middleton to fix building for USE_RENDERER_DLOPEN=0
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -906,7 +906,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 @@ -1603,13 +1603,13 @@ $(B)/tremulous$(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)/tremulous-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)),) |