X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=makefile.inc;h=f613591e1f2044d708078f4daa2acff16f75841d;hp=5620fc2b02ecdbfa47607a390b91be0566ddf524;hb=fe7a27c1f9ee6904eddecd54f0fcae461806d43c;hpb=e8ce3d3b6216616a3070467f6fd889f14f0e9db5

diff --git a/makefile.inc b/makefile.inc
index 5620fc2b..f613591e 100644
--- a/makefile.inc
+++ b/makefile.inc
@@ -45,33 +45,12 @@ STRIP?=strip
 
 ###### Sound #####
 
-OBJ_SND_COMMON=snd_main.o snd_mem.o snd_mix.o snd_ogg.o snd_wav.o
+OBJ_SND_COMMON=snd_main.o snd_mem.o snd_mix.o snd_ogg.o snd_wav.o $(OBJ_SND_XMP)
 
 # No sound
 OBJ_SND_NULL=snd_null.o
 LIB_SND_NULL=
 
-# Open Sound System (Linux, FreeBSD and Solaris)
-OBJ_SND_OSS=$(OBJ_SND_COMMON) snd_oss.o
-LIB_SND_OSS=$(LIB_SND_XMP)
-
-# Advanced Linux Sound Architecture (Linux)
-OBJ_SND_ALSA=$(OBJ_SND_COMMON) snd_alsa.o
-LIB_SND_ALSA=-lasound $(LIB_SND_XMP)
-
-# Core Audio (Mac OS X)
-OBJ_SND_COREAUDIO=$(OBJ_SND_COMMON) snd_coreaudio.o
-LIB_SND_COREAUDIO=-framework CoreAudio $(LIB_SND_XMP)
-
-# BSD / Sun audio API (NetBSD and OpenBSD)
-OBJ_SND_BSD=$(OBJ_SND_COMMON) snd_bsd.o
-LIB_SND_BSD=$(LIB_SND_XMP)
-
-# DirectX and Win32 WAVE output (Win32)
-OBJ_SND_WIN=$(OBJ_SND_COMMON) snd_win.o
-LIB_SND_WIN=$(LIB_SND_XMP)
-
-
 ###### Common objects and flags #####
 
 # Common objects
@@ -82,16 +61,25 @@ 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 \
 	cl_particles.o \
 	cl_screen.o \
 	cl_video.o \
+	cl_video_libavw.o \
 	clvm_cmds.o \
 	cmd.o \
 	collision.o \
 	com_crc16.o \
+	com_ents.o \
+	com_ents4.o \
+	com_game.o \
 	com_msg.o \
 	common.o \
 	console.o \
@@ -111,7 +99,6 @@ OBJ_COMMON= \
 	gl_textures.o \
 	hmac.o \
 	host.o \
-	host_cmd.o \
 	image.o \
 	image_png.o \
 	jpeg.o \
@@ -142,9 +129,15 @@ OBJ_COMMON= \
 	r_shadow.o \
 	r_sky.o \
 	r_sprites.o \
+	r_stats.o \
 	sbar.o \
 	sv_ccmds.o \
 	sv_demo.o \
+	sv_ents.o \
+	sv_ents4.o \
+	sv_ents5.o \
+	sv_ents_csqc.o \
+	sv_ents_nq.o \
 	sv_main.o \
 	sv_move.o \
 	sv_phys.o \
@@ -168,7 +161,7 @@ OBJ_MENU= \
 # note that builddate.c is very intentionally not compiled to a .o before
 # being linked, because it should be recompiled every time an executable is
 # built to give the executable a proper date string
-OBJ_SV= builddate.c sys_linux.o vid_null.o thread_null.o $(OBJ_SND_NULL) $(OBJ_COMMON)
+OBJ_SV= builddate.c sys_unix.o vid_null.o thread_null.o $(OBJ_SND_NULL) $(OBJ_COMMON)
 OBJ_SDL= builddate.c sys_sdl.o vid_sdl.o thread_sdl.o $(OBJ_MENU) $(OBJ_SND_COMMON) $(OBJ_SND_XMP) snd_sdl.o $(OBJ_VIDEO_CAPTURE) $(OBJ_COMMON)
 
 
@@ -178,7 +171,14 @@ ifeq ($(PEDANTIC),1)
 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_TCC=
+
+ifeq ($(CC), tcc)
+	CFLAGS_TCC=-DSDL_DISABLE_IMMINTRIN_H
+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=
 CFLAGS_DEBUG=-ggdb
@@ -220,7 +220,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)
+LDFLAGS_UNIXSDL=$(SDL_LIBS) #-lGLESv2
 EXE_UNIXSV=darkplaces-dedicated
 EXE_UNIXSDL=darkplaces-sdl
 EXE_UNIXSVNEXUIZ=nexuiz-dedicated
@@ -268,7 +268,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
@@ -427,21 +427,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)
 
-vid_glx.o: vid_glx.c
+sv_phys.o: sv_phys.c
 	$(CHECKLEVEL2)
-	$(DO_CC) -I/usr/X11R6/include
+	$(DO_CC) $(CFLAGS_ODE)
 
-keysym2ucs.o: keysym2ucs.c
+prvm_cmds.o: prvm_cmds.c
+	$(CHECKLEVEL2)
+	$(DO_CC) $(CFLAGS_ODE)
+
+world.o: world.c
 	$(CHECKLEVEL2)
-	$(DO_CC) -I/usr/X11R6/include
+	$(DO_CC) $(CFLAGS_ODE)
 
 crypto.o: crypto.c
 	$(CHECKLEVEL2)
@@ -451,6 +459,20 @@ mod_skeletal_animatevertices_sse.o: mod_skeletal_animatevertices_sse.c
 	$(CHECKLEVEL2)
 	$(DO_CC) $(CFLAGS_SSE)
 
+snd_xmp.o: snd_xmp.c
+	$(CHECKLEVEL2)
+	$(DO_CC) $(CFLAGS_SND_XMP)
+
+#this checks USEXMP when compiling so it needs the XMP flags as well
+snd_main.o: snd_main.c
+	$(CHECKLEVEL2)
+	$(DO_CC) $(CFLAGS_SND_XMP)
+
+#this checks USEXMP when compiling so it needs the XMP flags as well
+snd_mem.o: snd_mem.c
+	$(CHECKLEVEL2)
+	$(DO_CC) $(CFLAGS_SND_XMP)
+
 darkplaces.o: %.o : %.rc
 	$(CHECKLEVEL2)
 	$(WINDRES) -o $@ $<
@@ -486,6 +508,7 @@ clean:
 	-$(CMD_RM) $(EXE_SDLNEXUIZ)
 	-$(CMD_RM) *.o
 	-$(CMD_RM) *.d
+	-$(CMD_RM) *.gch
 	-$(CMD_RM) build-obj/
 
 clean-profile: clean