X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=makefile.inc;h=aaf506bacd201be80b2d28d585ad1605cc5e507b;hb=8c1799cb28a10745836509e202ef6e85df5d5e70;hp=ce15fefaeaf804a8b0a325e8de4b43f56c876f52;hpb=197da0b9148dfb2d1b16457df1ba1c08b86ff9c2;p=xonotic%2Fdarkplaces.git

diff --git a/makefile.inc b/makefile.inc
index ce15fefa..aaf506ba 100644
--- a/makefile.inc
+++ b/makefile.inc
@@ -79,8 +79,13 @@ OBJ_COMMON= \
 	bih.o \
 	crypto.o \
 	cd_shared.o \
+	cl_cmd.o \
 	cl_collision.o \
 	cl_demo.o \
+	cl_entframe.o \
+	cl_entframe5.o \
+	cl_entframe_quake.o \
+	cl_entframe_qw.o \
 	cl_input.o \
 	cl_main.o \
 	cl_parse.o \
@@ -91,6 +96,7 @@ OBJ_COMMON= \
 	cmd.o \
 	collision.o \
 	com_crc16.o \
+	com_entframe.o \
 	com_msg.o \
 	common.o \
 	console.o \
@@ -110,7 +116,6 @@ OBJ_COMMON= \
 	gl_textures.o \
 	hmac.o \
 	host.o \
-	host_cmd.o \
 	image.o \
 	image_png.o \
 	jpeg.o \
@@ -144,6 +149,10 @@ OBJ_COMMON= \
 	sbar.o \
 	sv_ccmds.o \
 	sv_demo.o \
+	sv_entframe.o \
+	sv_entframe5.o \
+	sv_entframe_csqc.o \
+	sv_entframe_quake.o \
 	sv_main.o \
 	sv_move.o \
 	sv_phys.o \
@@ -172,7 +181,12 @@ OBJ_SDL= builddate.c sys_sdl.o vid_sdl.o thread_sdl.o $(OBJ_MENU) $(OBJ_SND_COMM
 
 
 # Compilation
-CFLAGS_COMMON=$(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../../../
+ifeq ($(PEDANTIC),1)
+	CFLAGS_STANDARD=-std=c11 -pedantic -D_POSIX_C_SOURCE=200809L -DCONFIG_PEDANTIC
+else
+	CFLAGS_STANDARD=
+endif
+CFLAGS_COMMON=$(CFLAGS_STANDARD) $(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=
 CFLAGS_DEBUG=-ggdb