X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=makefile.inc;h=d04e5f866d331853f9ce5a90d981ece0cd05608c;hb=fa561c1a0e1f754cab309168853a0e3b253081c8;hp=341831fc448d7ad007f85c062ed9c2091c698eca;hpb=47bafbe6c0835c18460b27d121c0a879ac1f3940;p=xonotic%2Fdarkplaces.git

diff --git a/makefile.inc b/makefile.inc
index 341831fc..d04e5f86 100644
--- a/makefile.inc
+++ b/makefile.inc
@@ -101,7 +101,6 @@ OBJ_COMMON= \
 	cl_collision.o \
 	cl_demo.o \
 	cl_dyntexture.o \
-	cl_gecko.o \
 	cl_input.o \
 	cl_main.o \
 	cl_parse.o \
@@ -209,9 +208,9 @@ DO_CC=$(CC) $(CFLAGS) -c $< -o $@
 
 
 # Link
-LDFLAGS_DEBUG=-g -ggdb $(OPTIM_DEBUG) -DSVNREVISION=`test -d .svn && svnversion || test -d .git && git describe || echo -` -DBUILDTYPE=debug
-LDFLAGS_PROFILE=-g -pg -fprofile-arcs $(OPTIM_RELEASE) -DSVNREVISION=`test -d .svn && svnversion || test -d .git && git describe || echo -` -DBUILDTYPE=profile
-LDFLAGS_RELEASE=$(OPTIM_RELEASE) -DSVNREVISION=`test -d .svn && svnversion || test -d .git && git describe || echo -` -DBUILDTYPE=release
+LDFLAGS_DEBUG=-g -ggdb $(OPTIM_DEBUG) -DSVNREVISION=`{ test -d .svn && svnversion; } || { test -d .git && git describe --always; } || echo -` -DBUILDTYPE=debug
+LDFLAGS_PROFILE=-g -pg -fprofile-arcs $(OPTIM_RELEASE) -DSVNREVISION=`{ test -d .svn && svnversion; } || { test -d .git && git describe --always; } || echo -` -DBUILDTYPE=profile
+LDFLAGS_RELEASE=$(OPTIM_RELEASE) -DSVNREVISION=`{ test -d .svn && svnversion; } || { test -d .git && git describe --always; } || echo -` -DBUILDTYPE=release
 
 
 ##### UNIX specific variables #####
@@ -219,7 +218,7 @@ LDFLAGS_RELEASE=$(OPTIM_RELEASE) -DSVNREVISION=`test -d .svn && svnversion || te
 OBJ_GLX= builddate.c sys_linux.o vid_glx.o thread_pthread.o keysym2ucs.o $(OBJ_SOUND) $(OBJ_CD) $(OBJ_COMMON)
 
 LDFLAGS_UNIXCOMMON=-lm $(LIB_ODE) $(LIB_JPEG) $(LIB_CRYPTO) $(LIB_CRYPTO_RIJNDAEL)
-LDFLAGS_UNIXCL=-L$(UNIX_X11LIBPATH) -lX11 -lXpm -lXext -lXxf86dga -lXxf86vm -pthread $(LIB_SOUND)
+LDFLAGS_UNIXCL=-L$(UNIX_X11LIBPATH) -lX11 -lXpm -lXext -lXxf86vm -pthread $(LIB_SOUND)
 LDFLAGS_UNIXCL_PRELOAD=-lz -ljpeg -lpng -logg -ltheora -lvorbis -lvorbisenc -lvorbisfile -lcurl -lmodplug
 LDFLAGS_UNIXSV_PRELOAD=-lz -ljpeg -lpng -lcurl
 LDFLAGS_UNIXSDL_PRELOAD=-lz -ljpeg -lpng -logg -ltheora -lvorbis -lvorbisenc -lvorbisfile -lcurl -lmodplug
@@ -358,19 +357,19 @@ help:
 	@echo
 
 debug :
-	$(MAKE) sv-debug cl-debug sdl-debug
+	$(MAKE) $(TARGETS_DEBUG)
 
 profile :
-	$(MAKE) sv-profile cl-profile sdl-profile
+	$(MAKE) $(TARGETS_PROFILE)
 
 release :
-	$(MAKE) sv-release cl-release sdl-release
+	$(MAKE) $(TARGETS_RELEASE)
 
 release-profile :
-	$(MAKE) sv-release-profile cl-release-profile sdl-release-profile
+	$(MAKE) $(TARGETS_RELEASE_PROFILE)
 
 nexuiz :
-	$(MAKE) sv-nexuiz cl-nexuiz sdl-nexuiz
+	$(MAKE) $(TARGETS_NEXUIZ)
 
 cl-debug :
 	$(MAKE) bin-debug \
@@ -490,6 +489,11 @@ snd_modplug.o: snd_modplug.c
 	$(CHECKLEVEL2)
 	$(DO_CC) $(CFLAGS_SND_MODPLUG)
 
+#this checks ODE_DYNAMIC and ODE_STATIC when compiling so it needs the ODE flags as well
+prvm_cmd.o: prvm_cmd.c
+	$(CHECKLEVEL2)
+	$(DO_CC) $(CFLAGS_ODE)
+
 world.o: world.c
 	$(CHECKLEVEL2)
 	$(DO_CC) $(CFLAGS_ODE)
@@ -587,4 +591,3 @@ clean:
 clean-profile: clean
 	-$(CMD_RM) *.gcda
 	-$(CMD_RM) *.gcno
-