view models no longer receive stencil shadows (only basic light visibility culling...

[xonotic/darkplaces.git] / makefile.inc

diff --git a/makefile.inc b/makefile.inc
index e6dd4f1fefd0d88a87dcdb9be28482bc25edc686..a4052de0689dc50b87647661555eb8d949767e68 100644 (file)
--- a/makefile.inc
+++ b/makefile.inc
@@ -18,8 +18,6 @@ CPUOPTIMIZATIONS=
 
 SDL_CONFIG?=sdl-config
 
-DP_FS_BASEDIR?=
-
 
 ###### Sound and audio CD #####
 
@@ -123,13 +121,13 @@ OBJ_COMMON= \
        sv_move.o \
        sv_phys.o \
        sv_user.o \
+       svbsp.o \
        svvm_cmds.o \
        sys_shared.o \
        vid_shared.o \
        view.o \
        wad.o \
        world.o \
-       world_cs.o \
        zone.o
 
 # note that builddate.c is very intentionally not compiled to a .o before
@@ -140,14 +138,17 @@ OBJ_SDL= builddate.c sys_sdl.o vid_sdl.o $(OBJ_SND_COMMON) snd_sdl.o cd_sdl.o $(
 
 
 # Compilation
-CFLAGS_COMMON=$(CFLAGS_MAKEDEP) -DDP_FS_BASEDIR=\"$(DP_FS_BASEDIR)\" -Wall -Wsign-compare
+CFLAGS_COMMON=$(CFLAGS_MAKEDEP) $(CFLAGS_FS) -Wall -Wsign-compare -Wdeclaration-after-statement
 CFLAGS_DEBUG=-ggdb
 CFLAGS_PROFILE=-g -pg -ggdb
 CFLAGS_RELEASE=
 CFLAGS_SDL=`$(SDL_CONFIG) --cflags`
 
 OPTIM_DEBUG=$(CPUOPTIMIZATIONS)
-OPTIM_RELEASE=-O2 -fno-strict-aliasing -ffast-math -funroll-loops $(CPUOPTIMIZATIONS)
+#OPTIM_RELEASE=-O2 -fno-strict-aliasing -ffast-math -funroll-loops $(CPUOPTIMIZATIONS)
+#OPTIM_RELEASE=-O2 -fno-strict-aliasing -fno-math-errno -fno-trapping-math -ffinite-math-only -fno-signaling-nans -fcx-limited-range -funroll-loops $(CPUOPTIMIZATIONS)
+#OPTIM_RELEASE=-O2 -fno-strict-aliasing -funroll-loops $(CPUOPTIMIZATIONS)
+OPTIM_RELEASE=-O2 -fno-strict-aliasing $(CPUOPTIMIZATIONS)
 
 DO_CC=$(CC) $(CFLAGS) -c $< -o $@