X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=makefile.inc;h=a4052de0689dc50b87647661555eb8d949767e68;hp=4ae92164a199e1fe34f5b9a8d85b522827a11284;hb=9e0a39f4d5add83a1c31892e0d523098979c5612;hpb=1f640dd6c5487ebc50b005a3fca0f929a883968b

diff --git a/makefile.inc b/makefile.inc
index 4ae92164..a4052de0 100644
--- a/makefile.inc
+++ b/makefile.inc
@@ -1,34 +1,62 @@
-##### Variables that you may want to modify #####
-
 # Choose the compiler you want to use
 CC=gcc
 
-# K6/athlon optimizations
-#CPUOPTIMIZATIONS=-march=k6
-# Note: don't use -march=athlon, every gcc which has it currently (2.96-3.1)
-# have optimizer bugs (like entities disappearing randomly - a bug with
-# compiling BOX_ON_PLANE_SIDE in mathlib.h)
+# athlon optimizations
 #CPUOPTIMIZATIONS=-march=athlon
-# 686 optimizations
+# athlon xp optimizations
+#CPUOPTIMIZATIONS=-march=athlon-xp
+# athlon 64 optimizations
+#CPUOPTIMIZATIONS=-march=athlon64 -m32
+# Pentium 3 optimizations
+#CPUOPTIMIZATIONS=-march=pentium3
+# Pentium 4 optimizations
+#CPUOPTIMIZATIONS=-march=pentium4
+# 686 (Pentium Pro/II) optimizations
 #CPUOPTIMIZATIONS=-march=i686
-# No specific CPU
+# No specific CPU (386 compatible)
 CPUOPTIMIZATIONS=
 
+SDL_CONFIG?=sdl-config
+
+
+###### Sound and audio CD #####
+
+OBJ_SND_COMMON=snd_main.o snd_mem.o snd_mix.o snd_ogg.o snd_wav.o
+
+# No sound
+OBJ_SND_NULL=snd_null.o
+LIB_SND_NULL=
+
+# Open Sound System (Linux, FreeBSD and Solaris)
+OBJ_SND_OSS=$(OBJ_SND_COMMON) snd_oss.o
+LIB_SND_OSS=
 
-##### Variables that you shouldn't care about #####
+# Advanced Linux Sound Architecture (Linux)
+OBJ_SND_ALSA=$(OBJ_SND_COMMON) snd_alsa.o
+LIB_SND_ALSA=-lasound
+
+# Core Audio (Mac OS X)
+OBJ_SND_COREAUDIO=$(OBJ_SND_COMMON) snd_coreaudio.c
+LIB_SND_COREAUDIO=-framework CoreAudio
+
+# BSD / Sun audio API (NetBSD and OpenBSD)
+OBJ_SND_BSD=$(OBJ_SND_COMMON) snd_bsd.o
+LIB_SND_BSD=
+
+# DirectX and Win32 WAVE output (Win32)
+OBJ_SND_WIN=$(OBJ_SND_COMMON) snd_win.o
+LIB_SND_WIN=
 
-# Sound objects
-OBJ_COMMONSOUND=snd_dma.o snd_mem.o snd_mix.o snd_ogg.o
-OBJ_NOSOUND=snd_null.o
 
 # CD objects
-OBJ_COMMONCD=cd_shared.o
 OBJ_NOCD=cd_null.o
 
+
+###### Common objects and flags #####
+
 # Common objects
 OBJ_COMMON= \
-	cgame.o \
-	cgamevm.o \
+	cd_shared.o \
 	cl_collision.o \
 	cl_demo.o \
 	cl_input.o \
@@ -37,11 +65,12 @@ OBJ_COMMON= \
 	cl_particles.o \
 	cl_screen.o \
 	cl_video.o \
+	clvm_cmds.o \
 	cmd.o \
 	collision.o \
 	common.o \
 	console.o \
-	crc.o \
+	csprogs.o \
 	curves.o \
 	cvar.o \
 	dpvsimpledecode.o \
@@ -50,35 +79,35 @@ OBJ_COMMON= \
 	fs.o \
 	gl_backend.o \
 	gl_draw.o \
-	gl_models.o \
 	gl_rmain.o \
 	gl_rsurf.o \
 	gl_textures.o \
 	host.o \
 	host_cmd.o \
 	image.o \
+	image_png.o \
 	jpeg.o \
 	keys.o \
 	lhnet.o \
+	libcurl.o \
 	mathlib.o \
 	matrixlib.o \
+	mdfour.o \
 	menu.o \
 	meshqueue.o \
 	model_alias.o \
 	model_brush.o \
 	model_shared.o \
 	model_sprite.o \
+	mvm_cmds.o \
 	netconn.o \
 	palette.o \
+	polygon.o \
 	portals.o \
-	pr_cmds.o \
-	pr_edict.o \
-	pr_exec.o \
 	protocol.o \
 	prvm_cmds.o \
 	prvm_edict.o \
 	prvm_exec.o \
-	r_crosshairs.o \
 	r_explosion.o \
 	r_lerpanim.o \
 	r_light.o \
@@ -92,40 +121,42 @@ OBJ_COMMON= \
 	sv_move.o \
 	sv_phys.o \
 	sv_user.o \
+	svbsp.o \
+	svvm_cmds.o \
 	sys_shared.o \
-	ui.o \
 	vid_shared.o \
 	view.o \
 	wad.o \
-	wavefile.o \
-	winding.o \
 	world.o \
 	zone.o
 
 # note that builddate.c is very intentionally not compiled to a .o before
 # being linked, because it should be recompiled every time an executable is
 # built to give the executable a proper date string
-OBJ_SV= builddate.c sys_linux.o vid_null.o $(OBJ_NOSOUND) $(OBJ_NOCD) $(OBJ_COMMON)
-OBJ_SDL= builddate.c sys_sdl.o vid_sdl.o $(OBJ_NOSOUND) $(OBJ_NOCD) $(OBJ_COMMON)
+OBJ_SV= builddate.c sys_linux.o vid_null.o $(OBJ_SND_NULL) $(OBJ_NOCD) $(OBJ_COMMON)
+OBJ_SDL= builddate.c sys_sdl.o vid_sdl.o $(OBJ_SND_COMMON) snd_sdl.o cd_sdl.o $(OBJ_COMMON)
 
 
 # Compilation
-# CFLAGS_COMMON=-MD -Wall -Werror
-CFLAGS_COMMON=-MD -Wall
+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=
-OPTIM_RELEASE=-O2 -fno-strict-aliasing -ffast-math -funroll-loops $(CPUOPTIMIZATIONS)
+OPTIM_DEBUG=$(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 $@
 
 
 # Link
-LDFLAGS_DEBUG=-g -ggdb
-LDFLAGS_PROFILE=-g -pg
-LDFLAGS_RELEASE=
+LDFLAGS_DEBUG=-g -ggdb $(OPTIM_DEBUG)
+LDFLAGS_PROFILE=-g -pg $(OPTIM_RELEASE)
+LDFLAGS_RELEASE=$(OPTIM_RELEASE)
 
 
 ##### UNIX specific variables #####
@@ -133,32 +164,23 @@ LDFLAGS_RELEASE=
 OBJ_GLX= builddate.c sys_linux.o vid_glx.o $(OBJ_SOUND) $(OBJ_CD) $(OBJ_COMMON)
 
 LDFLAGS_UNIXCOMMON=-lm
-LDFLAGS_UNIXCL=-L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -lXxf86vm $(LIB_SOUND)
-LDFLAGS_UNIXSDL=`sdl-config --libs`
+LDFLAGS_UNIXCL=-L$(UNIX_X11LIBPATH) -lX11 -lXext -lXxf86dga -lXxf86vm $(LIB_SOUND)
+
+LDFLAGS_UNIXSDL=`$(SDL_CONFIG) --libs`
 EXE_UNIXCL=darkplaces-glx
 EXE_UNIXSV=darkplaces-dedicated
 EXE_UNIXSDL=darkplaces-sdl
+EXE_UNIXCLNEXUIZ=nexuiz-glx
+EXE_UNIXSVNEXUIZ=nexuiz-dedicated
+EXE_UNIXSDLNEXUIZ=nexuiz-sdl
 
 CMD_UNIXRM=rm -rf
 
 
 ##### Linux specific variables #####
 
-# Recommended for: anyone not using ALSA 0.5
-OBJ_LINUXSOUND=$(OBJ_COMMONSOUND) snd_oss.o
-LIB_LINUXSOUND=
-# Recommended for: anyone using ALSA 0.5
-#OBJ_LINUXSOUND=$(OBJ_COMMONSOUND) snd_alsa_0_5.o
-#LIB_LINUXSOUND=-lasound
-# Recommended for: no one (this driver needs to be updated, it doesn't compile anymore)
-#OBJ_LINUXSOUND=$(OBJ_COMMONSOUND) snd_alsa_0_9.o
-#LIB_LINUXSOUND=-lasound
-# Recommended for: anyone who can't use the above drivers
-#OBJ_LINUXSOUND=$(OBJ_NOSOUND)
-#LIB_LINUXSOUND=
-
 # If you want CD sound in Linux
-OBJ_LINUXCD=$(OBJ_COMMONCD) cd_linux.o
+OBJ_LINUXCD=cd_linux.o
 # If you want no CD audio
 #OBJ_LINUXCD=$(OBJ_NOCD)
 
@@ -168,14 +190,39 @@ LDFLAGS_LINUXSV=$(LDFLAGS_UNIXCOMMON) -ldl
 LDFLAGS_LINUXSDL=$(LDFLAGS_UNIXCOMMON) -ldl $(LDFLAGS_UNIXSDL)
 
 
-##### BSD specific variables #####
+##### Mac OS X specific variables #####
+
+# No CD support available
+OBJ_MACOSXCD=$(OBJ_NOCD)
+
+# Link
+LDFLAGS_MACOSXCL=$(LDFLAGS_UNIXCOMMON) -ldl -framework Carbon $(LIB_SOUND)
+LDFLAGS_MACOSXSV=$(LDFLAGS_UNIXCOMMON) -ldl
+LDFLAGS_MACOSXSDL=$(LDFLAGS_UNIXCOMMON) -ldl `$(SDL_CONFIG) --static-libs`
+
+OBJ_AGL= builddate.c sys_linux.o vid_agl.o $(OBJ_SOUND) $(OBJ_CD) $(OBJ_COMMON)
+
+EXE_MACOSXCL=darkplaces-agl
+EXE_MACOSXCLNEXUIZ=nexuiz-agl
+
+
+##### SunOS specific variables #####
 
-OBJ_BSDSOUND=$(OBJ_COMMONSOUND) snd_bsd.o
-#OBJ_BSDSOUND=$(OBJ_NOSOUND)
-LIB_BSDSOUND=
+# No CD support available
+OBJ_SUNOSCD=$(OBJ_NOCD)
+
+CFLAGS_SUNOS=-I/usr/lib/oss/include -DBSD_COMP -DSUNOS
+
+# Link
+LDFLAGS_SUNOSCL=$(LDFLAGS_UNIXCOMMON) -ldl -lsocket -lnsl -R$(UNIX_X11LIBPATH) -L$(UNIX_X11LIBPATH) -lX11 -lXext -lXxf86vm $(LIB_SOUND)
+LDFLAGS_SUNOSSV=$(LDFLAGS_UNIXCOMMON) -ldl -lsocket -lnsl
+LDFLAGS_SUNOSSDL=$(LDFLAGS_UNIXCOMMON) -ldl -lsocket -lnsl $(LDFLAGS_UNIXSDL)
+
+
+##### BSD specific variables #####
 
 #if you want CD sound in BSD
-OBJ_BSDCD=$(OBJ_COMMONCD) cd_bsd.o
+OBJ_BSDCD=cd_bsd.o
 #if you want no CD audio
 #OBJ_BSDCD=$(OBJ_NOCD)
 
@@ -187,25 +234,24 @@ LDFLAGS_BSDSDL=$(LDFLAGS_UNIXCOMMON) $(LDFLAGS_UNIXSDL)
 
 ##### Win32 specific variables #####
 
-OBJ_WINSOUND=$(OBJ_COMMONSOUND) snd_win.o
-#OBJ_WINSOUND=$(OBJ_NOSOUND)
-LIB_WINSOUND=
-
 #if you want CD sound in Win32
-OBJ_WINCD=$(OBJ_COMMONCD) cd_win.o
+OBJ_WINCD=cd_win.o
 #if you want no CD audio
 #OBJ_WINCD=$(OBJ_NOCD)
 
-OBJ_WGL= builddate.c sys_win.o vid_wgl.o conproc.o $(OBJ_WINSOUND) $(OBJ_WINCD) $(OBJ_COMMON)
+OBJ_WGL= builddate.c sys_win.o vid_wgl.o conproc.o $(OBJ_SND_WIN) $(OBJ_WINCD) $(OBJ_COMMON)
 
 # Link
 LDFLAGS_WINCOMMON=-lwinmm -lwsock32
 LDFLAGS_WINCL=$(LDFLAGS_WINCOMMON) -mwindows -luser32 -lgdi32 -ldxguid -ldinput -lcomctl32
-LDFLAGS_WINSV=$(LDFLAGS_WINCOMMON) -mconsole -lwinmm -lwsock32
-LDFLAGS_WINSDL=$(LDFLAGS_WINCOMMON)  -mwindows -luser32 -lgdi32 -ldxguid -ldinput -lcomctl32
+LDFLAGS_WINSV=$(LDFLAGS_WINCOMMON) -mconsole
+LDFLAGS_WINSDL=$(LDFLAGS_WINCOMMON) `$(SDL_CONFIG) --libs`
 EXE_WINCL=darkplaces.exe
 EXE_WINSV=darkplaces-dedicated.exe
 EXE_WINSDL=darkplaces-sdl.exe
+EXE_WINCLNEXUIZ=nexuiz.exe
+EXE_WINSVNEXUIZ=nexuiz-dedicated.exe
+EXE_WINSDLNEXUIZ=nexuiz-sdl.exe
 
 
 ##### Commands #####
@@ -224,81 +270,115 @@ help:
 	@echo "* $(MAKE) debug       : make client and server binaries (debug versions)"
 	@echo "* $(MAKE) profile     : make client and server binaries (profile versions)"
 	@echo "* $(MAKE) release     : make client and server binaries (release versions)"
+	@echo "* $(MAKE) nexuiz      : make client and server binaries with nexuiz icon (release versions)"
 	@echo "* $(MAKE) cl-debug    : make client (debug version)"
 	@echo "* $(MAKE) cl-profile  : make client (profile version)"
 	@echo "* $(MAKE) cl-release  : make client (release version)"
+	@echo "* $(MAKE) cl-nexuiz   : make client with nexuiz icon (release version)"
 	@echo "* $(MAKE) sv-debug    : make dedicated server (debug version)"
 	@echo "* $(MAKE) sv-profile  : make dedicated server (profile version)"
 	@echo "* $(MAKE) sv-release  : make dedicated server (release version)"
+	@echo "* $(MAKE) sv-nexuiz   : make dedicated server with nexuiz icon (release version)"
 	@echo "* $(MAKE) sdl-debug   : make SDL client (debug version)"
 	@echo "* $(MAKE) sdl-profile : make SDL client (profile version)"
 	@echo "* $(MAKE) sdl-release : make SDL client (release version)"
+	@echo "* $(MAKE) sdl-nexuiz  : make SDL client with nexuiz icon (release version)"
 	@echo
 
 debug :
-	$(MAKE) cl-debug sv-debug DP_MAKE_TARGET=$(DP_MAKE_TARGET)
+	$(MAKE) sv-debug cl-debug sdl-debug
 
 profile :
-	$(MAKE) cl-profile sv-profile DP_MAKE_TARGET=$(DP_MAKE_TARGET)
+	$(MAKE) sv-profile cl-profile sdl-profile
 
 release :
-	$(MAKE) cl-release sv-release DP_MAKE_TARGET=$(DP_MAKE_TARGET)
+	$(MAKE) sv-release cl-release sdl-release
+
+nexuiz :
+	$(MAKE) sv-nexuiz cl-nexuiz sdl-nexuiz
 
 cl-debug :
-	$(MAKE) bin-debug DP_MAKE_TARGET=$(DP_MAKE_TARGET) \
+	$(MAKE) bin-debug \
+		DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
 		EXE="$(EXE_CL)" LDFLAGS_COMMON="$(LDFLAGS_CL)"
 
 cl-profile :
-	$(MAKE) bin-profile DP_MAKE_TARGET=$(DP_MAKE_TARGET) \
+	$(MAKE) bin-profile \
+		DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
 		EXE="$(EXE_CL)" LDFLAGS_COMMON="$(LDFLAGS_CL)"
 
 cl-release :
-	$(MAKE) bin-release DP_MAKE_TARGET=$(DP_MAKE_TARGET) \
+	$(MAKE) bin-release \
+		DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
 		EXE="$(EXE_CL)" LDFLAGS_COMMON="$(LDFLAGS_CL)"
 
+cl-nexuiz :
+	$(MAKE) bin-release \
+		DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
+		EXE="$(EXE_CLNEXUIZ)" LDFLAGS_COMMON="$(LDFLAGS_CL)"
+
 sv-debug :
-	$(MAKE) bin-debug DP_MAKE_TARGET=$(DP_MAKE_TARGET) \
+	$(MAKE) bin-debug \
+		DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
 		EXE="$(EXE_SV)" LDFLAGS_COMMON="$(LDFLAGS_SV)"
 
 sv-profile :
-	$(MAKE) bin-profile DP_MAKE_TARGET=$(DP_MAKE_TARGET) \
+	$(MAKE) bin-profile \
+		DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
 		EXE="$(EXE_SV)" LDFLAGS_COMMON="$(LDFLAGS_SV)"
 
 sv-release :
-	$(MAKE) bin-release DP_MAKE_TARGET=$(DP_MAKE_TARGET) \
+	$(MAKE) bin-release \
+		DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
 		EXE="$(EXE_SV)" LDFLAGS_COMMON="$(LDFLAGS_SV)"
 
+sv-nexuiz :
+	$(MAKE) bin-release \
+		DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
+		EXE="$(EXE_SVNEXUIZ)" LDFLAGS_COMMON="$(LDFLAGS_SV)"
+
 sdl-debug :
-	$(MAKE) bin-debug DP_MAKE_TARGET=$(DP_MAKE_TARGET) \
+	$(MAKE) bin-debug \
+		DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
 		EXE="$(EXE_SDL)" LDFLAGS_COMMON="$(LDFLAGS_SDL)"
 
 sdl-profile :
-	$(MAKE) bin-profile DP_MAKE_TARGET=$(DP_MAKE_TARGET) \
+	$(MAKE) bin-profile \
+		DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
 		EXE="$(EXE_SDL)" LDFLAGS_COMMON="$(LDFLAGS_SDL)"
 
 sdl-release :
-	$(MAKE) bin-release DP_MAKE_TARGET=$(DP_MAKE_TARGET) \
+	$(MAKE) bin-release \
+		DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
 		EXE="$(EXE_SDL)" LDFLAGS_COMMON="$(LDFLAGS_SDL)"
 
+sdl-nexuiz :
+	$(MAKE) bin-release \
+		DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
+		EXE="$(EXE_SDLNEXUIZ)" LDFLAGS_COMMON="$(LDFLAGS_SDL)"
+
 bin-debug :
 	@echo
 	@echo "========== $(EXE) (debug) =========="
-	$(MAKE) $(EXE) DP_MAKE_TARGET=$(DP_MAKE_TARGET) \
-		CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_DEBUG) $(OPTIM_DEBUG)"\
+	$(MAKE) $(EXE) \
+		DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
+		CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_EXTRA) $(CFLAGS_DEBUG) $(OPTIM_DEBUG)"\
 		LDFLAGS="$(LDFLAGS_DEBUG) $(LDFLAGS_COMMON)"
 
 bin-profile :
 	@echo
 	@echo "========== $(EXE) (profile) =========="
-	$(MAKE) $(EXE) DP_MAKE_TARGET=$(DP_MAKE_TARGET) \
-		CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_PROFILE) $(OPTIM_RELEASE)"\
+	$(MAKE) $(EXE) \
+		DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
+		CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_EXTRA) $(CFLAGS_PROFILE) $(OPTIM_RELEASE)"\
 		LDFLAGS="$(LDFLAGS_PROFILE) $(LDFLAGS_COMMON)"
 
 bin-release :
 	@echo
 	@echo "========== $(EXE) (release) =========="
-	$(MAKE) $(EXE) DP_MAKE_TARGET=$(DP_MAKE_TARGET) \
-		CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_RELEASE) $(OPTIM_RELEASE)"\
+	$(MAKE) $(EXE) \
+		DP_MAKE_TARGET=$(DP_MAKE_TARGET) DP_SOUND_API=$(DP_SOUND_API) \
+		CFLAGS="$(CFLAGS_COMMON) $(CFLAGS_EXTRA) $(CFLAGS_RELEASE) $(OPTIM_RELEASE)"\
 		LDFLAGS="$(LDFLAGS_RELEASE) $(LDFLAGS_COMMON)"
 	strip $(EXE)
 
@@ -306,26 +386,50 @@ vid_glx.o: vid_glx.c
 	$(DO_CC) -I/usr/X11R6/include
 
 vid_sdl.o: vid_sdl.c
-	$(DO_CC) `sdl-config --cflags`
+	$(DO_CC) $(CFLAGS_SDL)
 
 sys_sdl.o: sys_sdl.c
-	$(DO_CC) `sdl-config --cflags`
+	$(DO_CC) $(CFLAGS_SDL)
+
+snd_sdl.o: snd_sdl.c
+	$(DO_CC) $(CFLAGS_SDL)
+
+cd_sdl.o: cd_sdl.c
+	$(DO_CC) $(CFLAGS_SDL)
+
+darkplaces.o: %.o : %.rc
+	windres -o $@ $<
+
+nexuiz.o: %.o : %.rc
+	windres -o $@ $<
 
 .c.o:
 	$(DO_CC)
 
-$(EXE_CL): $(OBJ_CL)
+$(EXE_CL): $(OBJ_CL) $(OBJ_ICON)
+	$(DO_LD)
+
+$(EXE_SV): $(OBJ_SV) $(OBJ_ICON)
+	$(DO_LD)
+
+$(EXE_SDL): $(OBJ_SDL) $(OBJ_ICON)
+	$(DO_LD)
+
+$(EXE_CLNEXUIZ): $(OBJ_CL) $(OBJ_ICON_NEXUIZ)
 	$(DO_LD)
 
-$(EXE_SV): $(OBJ_SV)
+$(EXE_SVNEXUIZ): $(OBJ_SV) $(OBJ_ICON_NEXUIZ)
 	$(DO_LD)
 
-$(EXE_SDL): $(OBJ_SDL)
+$(EXE_SDLNEXUIZ): $(OBJ_SDL) $(OBJ_ICON_NEXUIZ)
 	$(DO_LD)
 
 clean:
 	-$(CMD_RM) $(EXE_CL)
 	-$(CMD_RM) $(EXE_SV)
 	-$(CMD_RM) $(EXE_SDL)
+	-$(CMD_RM) $(EXE_CLNEXUIZ)
+	-$(CMD_RM) $(EXE_SVNEXUIZ)
+	-$(CMD_RM) $(EXE_SDLNEXUIZ)
 	-$(CMD_RM) *.o
 	-$(CMD_RM) *.d