keysym2ucs: Delete. Was only used for the GLX client which no longer exists

[xonotic/darkplaces.git] / makefile.inc

diff --git a/makefile.inc b/makefile.inc
index 34bdf696bb4511b1031503b1a3f1a8ad260f193c..5b150f9f782c2ddaf507ed0a6552377cb1dc23e0 100644 (file)
--- a/makefile.inc
+++ b/makefile.inc
@@ -100,6 +100,7 @@ OBJ_COMMON= \
        com_crc16.o \
        com_ents.o \
        com_ents4.o \
+       com_game.o \
        com_msg.o \
        common.o \
        console.o \
@@ -149,6 +150,7 @@ OBJ_COMMON= \
        r_shadow.o \
        r_sky.o \
        r_sprites.o \
+       r_stats.o \
        sbar.o \
        sv_ccmds.o \
        sv_demo.o \
@@ -239,7 +241,7 @@ LDFLAGS_UNIXSV_PRELOAD=-lz -ljpeg -lpng -lcurl
 LDFLAGS_UNIXSDL_PRELOAD=-lz -ljpeg -lpng -logg -ltheora -lvorbis -lvorbisenc -lvorbisfile -lcurl -lxmp
 CFLAGS_UNIX_PRELOAD=-DPREFER_PRELOAD
 
-LDFLAGS_UNIXSDL=$(SDLCONFIG_LIBS) #-lGLESv2
+LDFLAGS_UNIXSDL=$(SDL_LIBS) #-lGLESv2
 EXE_UNIXSV=darkplaces-dedicated
 EXE_UNIXSDL=darkplaces-sdl
 EXE_UNIXSVNEXUIZ=nexuiz-dedicated
@@ -287,7 +289,7 @@ WINDRES ?= windres
 # Link
 # see LDFLAGS_WINCOMMON in makefile
 LDFLAGS_WINSV=$(LDFLAGS_WINCOMMON) $(LIB_CRYPTO) $(LIB_CRYPTO_RIJNDAEL) -mconsole -lwinmm -lws2_32 $(LIB_Z) $(LIB_JPEG)
-LDFLAGS_WINSDL=$(LDFLAGS_WINCOMMON) $(LIB_CRYPTO) $(LIB_CRYPTO_RIJNDAEL) $(SDLCONFIG_LIBS) -lwinmm -lws2_32 $(LIB_Z) $(LIB_JPEG) $(LIB_SND_XMP)
+LDFLAGS_WINSDL=$(LDFLAGS_WINCOMMON) $(LIB_CRYPTO) $(LIB_CRYPTO_RIJNDAEL) $(LDFLAGS_UNIXSDL) -lwinmm -lws2_32 $(LIB_Z) $(LIB_JPEG) $(LIB_SND_XMP)
 EXE_WINSV=darkplaces-dedicated.exe
 EXE_WINSDL=darkplaces-sdl.exe
 EXE_WINSVNEXUIZ=nexuiz-dedicated.exe
@@ -446,21 +448,29 @@ prepare :
 
 
 #this checks USEODE when compiling so it needs the ODE flags as well
-prvm_cmds.o: prvm_cmds.c
+cl_parse.o: cl_parse.c
        $(CHECKLEVEL2)
        $(DO_CC) $(CFLAGS_ODE)
 
-world.o: world.c
+cs_progs.o: cs_progs.c
+       $(CHECKLEVEL2)
+       $(DO_CC) $(CFLAGS_ODE)
+
+sv_main.o: sv_main.c
+       $(CHECKLEVEL2)
+       $(DO_CC) $(CFLAGS_ODE)
+
+sv_phys.o: sv_phys.c
        $(CHECKLEVEL2)
        $(DO_CC) $(CFLAGS_ODE)
 
-vid_glx.o: vid_glx.c
+prvm_cmds.o: prvm_cmds.c
        $(CHECKLEVEL2)
-       $(DO_CC) -I/usr/X11R6/include
+       $(DO_CC) $(CFLAGS_ODE)
 
-keysym2ucs.o: keysym2ucs.c
+world.o: world.c
        $(CHECKLEVEL2)
-       $(DO_CC) -I/usr/X11R6/include
+       $(DO_CC) $(CFLAGS_ODE)
 
 crypto.o: crypto.c
        $(CHECKLEVEL2)
@@ -519,6 +529,7 @@ clean:
        -$(CMD_RM) $(EXE_SDLNEXUIZ)
        -$(CMD_RM) *.o
        -$(CMD_RM) *.d
+       -$(CMD_RM) *.gch
        -$(CMD_RM) build-obj/
 
 clean-profile: clean