X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=makefile;h=be168a3bcb0fa8cd2bb0a61abe0ed27adfd57785;hb=1f44287dbfadd29e4e6eec914e68455a53ec82e6;hp=8a264c6f9d58a6fad7c9cd83e4307dabea25a19b;hpb=1a543422750a2fc9154bb10edddde769cca85638;p=xonotic%2Fdarkplaces.git

diff --git a/makefile b/makefile
index 8a264c6f..be168a3b 100644
--- 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,14 +69,15 @@ OBJ_DED_EXE= builddate.c sys_linux.o vid_null.o cd_null.o snd_null.o $(COMMONOBJ
 
 
 # Compilation
-CFLAGS_NONEXECOMMON=-MD -Wall -Werror
+# 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 $@