X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=makefile.inc;h=f613591e1f2044d708078f4daa2acff16f75841d;hp=2fdc966a2d3c1c612d6b5b6deba187e40f165965;hb=49f0e1cbc8bc4ea8a165e8b86092c40bf4599a8e;hpb=ce12b0f5cc246070427a805bb3078163bcff2490 diff --git a/makefile.inc b/makefile.inc index 2fdc966a..f613591e 100644 --- a/makefile.inc +++ b/makefile.inc @@ -51,27 +51,6 @@ OBJ_SND_COMMON=snd_main.o snd_mem.o snd_mix.o snd_ogg.o snd_wav.o $(OBJ_SND_XMP) 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= - -# Advanced Linux Sound Architecture (Linux) -OBJ_SND_ALSA=$(OBJ_SND_COMMON) snd_alsa.o -LIB_SND_ALSA=-lasound - -# Core Audio (Mac OS X) -OBJ_SND_COREAUDIO=$(OBJ_SND_COMMON) snd_coreaudio.o -LIB_SND_COREAUDIO=-framework CoreAudio - -# BSD / Sun audio API (NetBSD and OpenBSD) -OBJ_SND_BSD=$(OBJ_SND_COMMON) snd_bsd.o -LIB_SND_BSD= - -# DirectX and Win32 WAVE output (Win32) -OBJ_SND_WIN=$(OBJ_SND_COMMON) snd_win.o -LIB_SND_WIN= - - ###### Common objects and flags ##### # Common objects @@ -101,7 +80,6 @@ OBJ_COMMON= \ com_ents.o \ com_ents4.o \ com_game.o \ - com_list.o \ com_msg.o \ common.o \ console.o \ @@ -449,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) -I/usr/X11R6/include + $(DO_CC) $(CFLAGS_ODE) + +world.o: world.c + $(CHECKLEVEL2) + $(DO_CC) $(CFLAGS_ODE) crypto.o: crypto.c $(CHECKLEVEL2)