Merged CL_RocketTrail2 into CL_RocketTrail.

[xonotic/darkplaces.git] / makefile.inc

diff --git a/makefile.inc b/makefile.inc
index 3a09a9b06b966766901365c2ef71842f711a3180..d0cf6b4b02d19e1e56b2540b0f83086da0dfd239 100644 (file)
--- a/makefile.inc
+++ b/makefile.inc
@@ -70,6 +70,7 @@ OBJ_COMMON= \
        model_sprite.o \
        netconn.o \
        palette.o \
+       polygon.o \
        portals.o \
        pr_cmds.o \
        pr_edict.o \
@@ -97,7 +98,6 @@ OBJ_COMMON= \
        vid_shared.o \
        view.o \
        wad.o \
-       wavefile.o \
        winding.o \
        world.o \
        zone.o
@@ -144,14 +144,11 @@ CMD_UNIXRM=rm -rf
 
 ##### Linux specific variables #####
 
-# Recommended for: anyone not using ALSA 0.5
+# Recommended for: anyone not using ALSA
 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
+# Recommended for: anyone using ALSA
+#OBJ_LINUXSOUND=$(OBJ_COMMONSOUND) snd_alsa.o
 #LIB_LINUXSOUND=-lasound
 # Recommended for: anyone who can't use the above drivers
 #OBJ_LINUXSOUND=$(OBJ_NOSOUND)
@@ -196,7 +193,7 @@ 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 darkplaces.o sys_win.o vid_wgl.o conproc.o $(OBJ_WINSOUND) $(OBJ_WINCD) $(OBJ_COMMON)
 
 # Link
 LDFLAGS_WINCOMMON=-lwinmm -lwsock32
@@ -311,6 +308,9 @@ vid_sdl.o: vid_sdl.c
 sys_sdl.o: sys_sdl.c
        $(DO_CC) `sdl-config --cflags`
 
+darkplaces.o: %.o : %.rc
+       windres -o $@ $<
+
 .c.o:
        $(DO_CC)