removed a temporary comment from Black

[xonotic/darkplaces.git] / makefile

diff --git a/makefile b/makefile
index 25a97211115cb5d1f901ee94e5760248051b1689..be168a3bcb0fa8cd2bb0a61abe0ed27adfd57785 100644 (file)
--- a/makefile
+++ b/makefile
@@ -47,17 +47,16 @@ CLIENTOBJECTS=      cgame.o cgamevm.o chase.o cl_collision.o cl_demo.o cl_input.o \
                console.o dpvsimpledecode.o fractalnoise.o gl_backend.o \
                gl_draw.o gl_models.o gl_rmain.o gl_rsurf.o gl_textures.o \
                jpeg.o keys.o menu.o meshqueue.o r_crosshairs.o r_explosion.o \
-               r_lerpanim.o r_light.o r_modules.o r_sky.o \
+               r_lerpanim.o r_light.o r_lightning.o r_modules.o r_sky.o \
                r_sprites.o sbar.o ui.o vid_shared.o view.o wavefile.o \
-               r_shadow.o
-SERVEROBJECTS= pr_cmds.o pr_edict.o pr_exec.o sv_light.o sv_main.o sv_move.o \
+                r_shadow.o prvm_exec.o prvm_edict.o prvm_cmds.o
+SERVEROBJECTS= pr_cmds.o pr_edict.o pr_exec.o sv_main.o sv_move.o \
                sv_phys.o sv_user.o
 SHAREDOBJECTS= cmd.o collision.o common.o crc.o cvar.o \
                filematch.o host.o host_cmd.o image.o mathlib.o matrixlib.o \
                model_alias.o model_brush.o model_shared.o model_sprite.o \
-               net_bsd.o net_dgrm.o net_loop.o net_main.o net_master.o \
-               net_udp.o palette.o portals.o protocol.o fs.o \
-               sys_shared.o world.o wad.o zone.o
+               netconn.o lhnet.o palette.o portals.o protocol.o fs.o \
+               sys_shared.o winding.o world.o wad.o zone.o curves.o
 COMMONOBJECTS= $(CLIENTOBJECTS) $(SERVEROBJECTS) $(SHAREDOBJECTS)
 
 # note that builddate.c is very intentionally not compiled to a .o before
@@ -70,13 +69,15 @@ OBJ_DED_EXE= builddate.c sys_linux.o vid_null.o cd_null.o snd_null.o $(COMMONOBJ
 
 
 # Compilation
-CFLAGS_COMMON=-MD -Wall -Werr
+# CFLAGS_NONEXECOMMON=-MD -Wall -Werror
+CFLAGS_NONEXECOMMON=-MD -Wall
+CFLAGS_EXECOMMON=-MD -Wall
 CFLAGS_DEBUG=-ggdb
 CFLAGS_PROFILE=-g -pg -ggdb
 CFLAGS_RELEASE=
 
 OPTIM_DEBUG=
-OPTIM_RELEASE= -O9 -fno-strict-aliasing -ffast-math -fexpensive-optimizations $(CPUOPTIMIZATIONS)
+OPTIM_RELEASE= -O2 -fno-strict-aliasing -ffast-math -fexpensive-optimizations $(CPUOPTIMIZATIONS)
 
 DO_CC=$(CC) $(CFLAGS) -c $< -o $@
 
@@ -154,40 +155,40 @@ exerelease :
        $(MAKE) wglexe-release dedexe-release
 
 glx-debug :
-       $(MAKE) bin-debug EXE="$(EXE_GLX)" LDFLAGS_COMMON="$(LDFLAGS_GLX)"
+       $(MAKE) bin-debug EXE="$(EXE_GLX)" LDFLAGS_COMMON="$(LDFLAGS_GLX)" CFLAGS_COMMON="$(CFLAGS_NONEXECOMMON)"
 
 glx-profile :
-       $(MAKE) bin-profile EXE="$(EXE_GLX)" LDFLAGS_COMMON="$(LDFLAGS_GLX)"
+       $(MAKE) bin-profile EXE="$(EXE_GLX)" LDFLAGS_COMMON="$(LDFLAGS_GLX)" CFLAGS_COMMON="$(CFLAGS_NONEXECOMMON)"
 
 glx-release :
-       $(MAKE) bin-release EXE="$(EXE_GLX)" LDFLAGS_COMMON="$(LDFLAGS_GLX)"
+       $(MAKE) bin-release EXE="$(EXE_GLX)" LDFLAGS_COMMON="$(LDFLAGS_GLX)" CFLAGS_COMMON="$(CFLAGS_NONEXECOMMON)"
 
 ded-debug :
-       $(MAKE) bin-debug EXE="$(EXE_DED)" LDFLAGS_COMMON="$(LDFLAGS_DED)"
+       $(MAKE) bin-debug EXE="$(EXE_DED)" LDFLAGS_COMMON="$(LDFLAGS_DED)" CFLAGS_COMMON="$(CFLAGS_NONEXECOMMON)"
 
 ded-profile :
-       $(MAKE) bin-profile EXE="$(EXE_DED)" LDFLAGS_COMMON="$(LDFLAGS_DED)"
+       $(MAKE) bin-profile EXE="$(EXE_DED)" LDFLAGS_COMMON="$(LDFLAGS_DED)" CFLAGS_COMMON="$(CFLAGS_NONEXECOMMON)"
 
 ded-release :
-       $(MAKE) bin-release EXE="$(EXE_DED)" LDFLAGS_COMMON="$(LDFLAGS_DED)"
+       $(MAKE) bin-release EXE="$(EXE_DED)" LDFLAGS_COMMON="$(LDFLAGS_DED)" CFLAGS_COMMON="$(CFLAGS_NONEXECOMMON)"
 
 wglexe-debug :
-       $(MAKE) bin-debug EXE="$(EXE_WGL_EXE)" LDFLAGS_COMMON="$(LDFLAGS_WGL_EXE)"
+       $(MAKE) bin-debug EXE="$(EXE_WGL_EXE)" LDFLAGS_COMMON="$(LDFLAGS_WGL_EXE)" CFLAGS_COMMON="$(CFLAGS_EXECOMMON)"
 
 wglexe-profile :
-       $(MAKE) bin-profile EXE="$(EXE_WGL_EXE)" LDFLAGS_COMMON="$(LDFLAGS_WGL_EXE)"
+       $(MAKE) bin-profile EXE="$(EXE_WGL_EXE)" LDFLAGS_COMMON="$(LDFLAGS_WGL_EXE)" CFLAGS_COMMON="$(CFLAGS_EXECOMMON)"
 
 wglexe-release :
-       $(MAKE) bin-release EXE="$(EXE_WGL_EXE)" LDFLAGS_COMMON="$(LDFLAGS_WGL_EXE)"
+       $(MAKE) bin-release EXE="$(EXE_WGL_EXE)" LDFLAGS_COMMON="$(LDFLAGS_WGL_EXE)" CFLAGS_COMMON="$(CFLAGS_EXECOMMON)"
 
 dedexe-debug :
-       $(MAKE) bin-debug EXE="$(EXE_DED_EXE)" LDFLAGS_COMMON="$(LDFLAGS_DED_EXE)"
+       $(MAKE) bin-debug EXE="$(EXE_DED_EXE)" LDFLAGS_COMMON="$(LDFLAGS_DED_EXE)" CFLAGS_COMMON="$(CFLAGS_EXECOMMON)"
 
 dedexe-profile :
-       $(MAKE) bin-profile EXE="$(EXE_DED_EXE)" LDFLAGS_COMMON="$(LDFLAGS_DED_EXE)"
+       $(MAKE) bin-profile EXE="$(EXE_DED_EXE)" LDFLAGS_COMMON="$(LDFLAGS_DED_EXE)" CFLAGS_COMMON="$(CFLAGS_EXECOMMON)"
 
 dedexe-release :
-       $(MAKE) bin-release EXE="$(EXE_DED_EXE)" LDFLAGS_COMMON="$(LDFLAGS_DED_EXE)"
+       $(MAKE) bin-release EXE="$(EXE_DED_EXE)" LDFLAGS_COMMON="$(LDFLAGS_DED_EXE)" CFLAGS_COMMON="$(CFLAGS_EXECOMMON)"
 
 bin-debug :
        @echo