X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=makefile.inc;h=8c4b4d582b31ebe5f7bb4b200ac38c59c5633724;hp=98228052394476b864b993cf73a65b0b8b34761d;hb=c1b6eed70bc5804233526e8890f7d361a3e16f07;hpb=73f27d62983b6af1cb9a6971d0a4cb6275b91a07

diff --git a/makefile.inc b/makefile.inc
index 98228052..8c4b4d58 100644
--- a/makefile.inc
+++ b/makefile.inc
@@ -51,27 +51,6 @@ OBJ_SND_COMMON=snd_main.o snd_mem.o snd_mix.o snd_ogg.o snd_wav.o $(OBJ_SND_XMP)
 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=
-
-# 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.o
-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=
-
-
 ###### Common objects and flags #####
 
 # Common objects
@@ -101,6 +80,7 @@ OBJ_COMMON= \
 	com_ents.o \
 	com_ents4.o \
 	com_game.o \
+	com_infostring.o \
 	com_msg.o \
 	common.o \
 	console.o \
@@ -472,14 +452,6 @@ world.o: world.c
 	$(CHECKLEVEL2)
 	$(DO_CC) $(CFLAGS_ODE)
 
-vid_glx.o: vid_glx.c
-	$(CHECKLEVEL2)
-	$(DO_CC) -I/usr/X11R6/include
-
-keysym2ucs.o: keysym2ucs.c
-	$(CHECKLEVEL2)
-	$(DO_CC) -I/usr/X11R6/include
-
 crypto.o: crypto.c
 	$(CHECKLEVEL2)
 	$(DO_CC) $(CFLAGS_CRYPTO) $(CFLAGS_CRYPTO_RIJNDAEL)