fix the "newname changed name to newname" bug

[xonotic/darkplaces.git] / makefile.inc

diff --git a/makefile.inc b/makefile.inc
index 4443fd0f4f287e0c941089597d6eb42fded32217..7568ec5d663ed07ea99e3df78ea000de8443ea99 100644 (file)
--- a/makefile.inc
+++ b/makefile.inc
@@ -18,8 +18,10 @@ CPUOPTIMIZATIONS=
 ##### Variables that you shouldn't care about #####
 
 # Sound objects
-OBJ_COMMONSOUND=snd_dma.o snd_mem.o snd_mix.o snd_ogg.o snd_wav.o
+OBJ_COMMONSOUND=snd_main.o snd_mem.o snd_mix.o snd_ogg.o snd_wav.o
 OBJ_NOSOUND=snd_null.o
+OBJ_OSSSOUND=$(OBJ_COMMONSOUND) snd_oss.o
+LIB_OSSSOUND=
 
 # CD objects
 OBJ_NOCD=cd_null.o
@@ -106,7 +108,7 @@ OBJ_COMMON= \
 # 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_SDL= builddate.c sys_sdl.o vid_sdl.o $(OBJ_COMMONSOUND) snd_sdl.o cd_sdl.o $(OBJ_COMMON)
 
 
 # Compilation
@@ -146,8 +148,8 @@ CMD_UNIXRM=rm -rf
 ##### Linux specific variables #####
 
 # Recommended for: anyone not using ALSA
-OBJ_LINUXSOUND=$(OBJ_COMMONSOUND) snd_oss.o
-LIB_LINUXSOUND=
+OBJ_LINUXSOUND=$(OBJ_OSSSOUND)
+LIB_LINUXSOUND=$(LIB_OSSSOUND)
 # Recommended for: anyone using ALSA
 #OBJ_LINUXSOUND=$(OBJ_COMMONSOUND) snd_alsa.o
 #LIB_LINUXSOUND=-lasound
@@ -200,7 +202,7 @@ OBJ_WGL= builddate.c darkplaces.o sys_win.o vid_wgl.o conproc.o $(OBJ_WINSOUND)
 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_WINSDL=$(LDFLAGS_WINCOMMON)  -mwindows -luser32 -lgdi32 -ldxguid -ldinput -lcomctl32 -lSDL
 EXE_WINCL=darkplaces.exe
 EXE_WINSV=darkplaces-dedicated.exe
 EXE_WINSDL=darkplaces-sdl.exe
@@ -309,6 +311,12 @@ vid_sdl.o: vid_sdl.c
 sys_sdl.o: sys_sdl.c
        $(DO_CC) `sdl-config --cflags`
 
+snd_sdl.o: snd_sdl.c
+       $(DO_CC) `sdl-config --cflags`
+
+cd_sdl.o: cd_sdl.c
+       $(DO_CC) `sdl-config --cflags`
+
 darkplaces.o: %.o : %.rc
        windres -o $@ $<