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 bdf7b8089697cf7c5b455d8ad8f8cb3cb138f395..5b150f9f782c2ddaf507ed0a6552377cb1dc23e0 100644 (file)
--- a/makefile.inc
+++ b/makefile.inc
@@ -82,6 +82,11 @@ OBJ_COMMON= \
        cl_cmd.o \
        cl_collision.o \
        cl_demo.o \
+       cl_ents.o \
+       cl_ents4.o \
+       cl_ents5.o \
+       cl_ents_nq.o \
+       cl_ents_qw.o \
        cl_input.o \
        cl_main.o \
        cl_parse.o \
@@ -96,7 +101,6 @@ OBJ_COMMON= \
        com_ents.o \
        com_ents4.o \
        com_game.o \
-       com_list.o \
        com_msg.o \
        common.o \
        console.o \
@@ -171,13 +175,6 @@ OBJ_COMMON= \
        world.o \
        zone.o
 
-OBJ_CL= \
-       cl_ents.o \
-       cl_ents4.o \
-       cl_ents5.o \
-       cl_ents_qw.o \
-       cl_ents_nq.o
-
 OBJ_MENU= \
        menu.o \
        mvm_cmds.o
@@ -204,7 +201,7 @@ endif
 
 CFLAGS_COMMON=$(CFLAGS_STANDARD) $(CFLAGS_TCC) $(CFLAGS_MAKEDEP) $(CFLAGS_PRELOAD) $(CFLAGS_FS) $(CFLAGS_WARNINGS) $(CFLAGS_LIBZ) $(CFLAGS_LIBJPEG) $(CFLAGS_SND_XMP) $(CFLAGS_NET) $(CFLAGS_SDL) -D_FILE_OFFSET_BITS=64 -D__KERNEL_STRICT_NAMES -I../../../
 CFLAGS_CLIENT=-DCONFIG_MENU $(CFLAGS_VIDEO_CAPTURE)
-CFLAGS_SERVER=-DSERVERONLY
+CFLAGS_SERVER=
 CFLAGS_DEBUG=-ggdb
 CFLAGS_PROFILE=-g -pg -ggdb -fprofile-arcs
 CFLAGS_RELEASE=
@@ -451,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)
 
-vid_glx.o: vid_glx.c
+sv_main.o: sv_main.c
        $(CHECKLEVEL2)
-       $(DO_CC) -I/usr/X11R6/include
+       $(DO_CC) $(CFLAGS_ODE)
+
+sv_phys.o: sv_phys.c
+       $(CHECKLEVEL2)
+       $(DO_CC) $(CFLAGS_ODE)
+
+prvm_cmds.o: prvm_cmds.c
+       $(CHECKLEVEL2)
+       $(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)
@@ -505,7 +510,7 @@ $(EXE_SV): $(OBJ_SV) $(OBJ_ICON)
        $(CHECKLEVEL2)
        $(DO_LD)
 
-$(EXE_SDL): $(OBJ_CL) $(OBJ_SDL) $(OBJ_ICON)
+$(EXE_SDL): $(OBJ_SDL) $(OBJ_ICON)
        $(CHECKLEVEL2)
        $(DO_LD)
 
@@ -513,7 +518,7 @@ $(EXE_SVNEXUIZ): $(OBJ_SV) $(OBJ_ICON_NEXUIZ)
        $(CHECKLEVEL2)
        $(DO_LD)
 
-$(EXE_SDLNEXUIZ): $(OBJ_CL) $(OBJ_SDL) $(OBJ_ICON_NEXUIZ)
+$(EXE_SDLNEXUIZ): $(OBJ_SDL) $(OBJ_ICON_NEXUIZ)
        $(CHECKLEVEL2)
        $(DO_LD)