Revert "Eliminate a few client-only files from the dedicated build"

[xonotic/darkplaces.git] / makefile.inc

diff --git a/makefile.inc b/makefile.inc
index bdf7b8089697cf7c5b455d8ad8f8cb3cb138f395..2fdc966a2d3c1c612d6b5b6deba187e40f165965 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 \
@@ -171,13 +176,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 +202,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=
@@ -505,7 +503,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 +511,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)