X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=makefile.mingw;h=1f9d38527ce0722b9ba87cd8fbe2547109a6bd25;hp=b85e788f6bb2b6020c71b422cafd6adc62bf0c0e;hb=927449b5ad3a24c07444744df5273d64c79a67f1;hpb=6bcce2962b3a088bd816d473efebe71ac677dc99

diff --git a/makefile.mingw b/makefile.mingw
index b85e788f..1f9d3852 100644
--- a/makefile.mingw
+++ b/makefile.mingw
@@ -1,5 +1,16 @@
 
-OBJECTS= builddate.o chase.o cl_demo.o cl_input.o cl_main.o cl_parse.o cmd.o common.o console.o crc.o cvar.o fractalnoise.o gl_draw.o r_sky.o gl_rmain.o gl_rsurf.o host.o host_cmd.o image.o keys.o mathlib.o menu.o model_alias.o model_brush.o model_shared.o model_sprite.o net_dgrm.o net_loop.o net_main.o pr_cmds.o pr_edict.o pr_exec.o r_light.o r_explosion.o sbar.o snd_dma.o snd_mem.o snd_mix.o sv_main.o sv_move.o sv_phys.o sv_user.o sv_light.o transform.o view.o wad.o world.o zone.o vid_shared.o palette.o r_crosshairs.o gl_textures.o gl_models.o r_sprites.o r_modules.o r_explosion.o r_lerpanim.o protocol.o quakeio.o ui.o portals.o sys_shared.o gl_backend.o cl_particles.o cl_screen.o cgamevm.o cgame.o filematch.o collision.o cl_collision.o matrixlib.o cl_video.o dpvsimpledecode.o wavefile.o meshqueue.o net_master.o r_shadow.o
+OBJECTS= builddate.o chase.o cl_demo.o cl_input.o cl_main.o cl_parse.o cmd.o \
+	common.o console.o crc.o cvar.o fractalnoise.o gl_draw.o r_sky.o \
+	gl_rmain.o gl_rsurf.o host.o host_cmd.o image.o keys.o mathlib.o menu.o \
+	model_alias.o model_brush.o model_shared.o model_sprite.o net_dgrm.o \
+	net_loop.o net_main.o pr_cmds.o pr_edict.o pr_exec.o r_light.o \
+	sbar.o snd_dma.o snd_mem.o snd_mix.o sv_main.o sv_move.o \
+	sv_phys.o sv_user.o sv_light.o view.o wad.o world.o zone.o vid_shared.o \
+	palette.o r_crosshairs.o gl_textures.o gl_models.o r_sprites.o \
+	r_modules.o r_explosion.o r_lerpanim.o protocol.o fs.o ui.o \
+	portals.o sys_shared.o gl_backend.o cl_particles.o cl_screen.o cgamevm.o \
+	cgame.o filematch.o collision.o cl_collision.o matrixlib.o cl_video.o \
+	dpvsimpledecode.o wavefile.o meshqueue.o net_master.o r_shadow.o jpeg.o
 
 #K6/athlon optimizations
 #CPUOPTIMIZATIONS=-march=k6
@@ -12,7 +23,8 @@ CPUOPTIMIZATIONS=
 #the -Werror can be removed to compile even if there are warnings,
 #this is used to ensure that all released versions are free of warnings.
 
-OPTIMIZATIONS= -O6 -fno-strict-aliasing -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations $(CPUOPTIMIZATIONS) -Werror
+OPTIMIZATIONS= -O2 -fno-strict-aliasing $(CPUOPTIMIZATIONS)
+#OPTIMIZATIONS= -O6 -fno-strict-aliasing -ffast-math -funroll-loops -fomit-frame-pointer -fexpensive-optimizations $(CPUOPTIMIZATIONS)
 # -D WIN32 -D NDEBUG -D _WINDOWS -D _M_IX86
 
 CFLAGS= -MD -Wall $(OPTIMIZATIONS)
@@ -28,7 +40,7 @@ builddate:
 .c.o:
 	gcc $(CFLAGS) -c $*.c
 
-darkplaces: $(OBJECTS) vid_wgl.o sys_win.o snd_win.o net_win.o net_wins.o net_wipx.o cd_win.o conproc.o
+darkplaces: $(OBJECTS) vid_wgl.o sys_win.o snd_win.o net_bsd.o net_wins.o cd_win.o conproc.o
 	gcc -o $@ $^ $(LDFLAGS)