X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=makefile;h=e5d8ce82880041865c1647660de2fddf3dc12de9;hb=890d4c00928b263763b460cb6f5b6a828fd4afc7;hp=bed6ab0d2b1dd6cebb86b7a5fa3acb76dd8efaa1;hpb=b4d7cbeb34a1a430ab145c0b446eac4f3795f4ca;p=xonotic%2Fdarkplaces.git

diff --git a/makefile b/makefile
index bed6ab0d..e5d8ce82 100644
--- a/makefile
+++ b/makefile
@@ -42,15 +42,15 @@ endif
 
 # 64bits AMD CPUs use another lib directory
 ifeq ($(DP_MACHINE),x86_64)
-	UNIX_X11LIBPATH:=-L/usr/X11R6/lib64
+	UNIX_X11LIBPATH:=/usr/X11R6/lib64
 else
-	UNIX_X11LIBPATH:=-L/usr/X11R6/lib
+	UNIX_X11LIBPATH:=/usr/X11R6/lib
 endif
 
 
 # Linux configuration
 ifeq ($(DP_MAKE_TARGET), linux)
-	DEFAULT_SNDAPI=$(DEFAULT_SNDAPI_LINUX)
+	DEFAULT_SNDAPI=ALSA
 	OBJ_CD=$(OBJ_LINUXCD)
 
 	OBJ_CL=$(OBJ_GLX)
@@ -66,7 +66,7 @@ endif
 
 # Mac OS X configuration
 ifeq ($(DP_MAKE_TARGET), macosx)
-	DEFAULT_SNDAPI=$(DEFAULT_SNDAPI_MACOSX)
+	DEFAULT_SNDAPI=COREAUDIO
 	OBJ_CD=$(OBJ_MACOSXCD)
 
 	OBJ_CL=$(OBJ_AGL)
@@ -75,14 +75,14 @@ ifeq ($(DP_MAKE_TARGET), macosx)
 	LDFLAGS_SV=$(LDFLAGS_MACOSXSV)
 	LDFLAGS_SDL=$(LDFLAGS_MACOSXSDL)
 
-	EXE_CL=$(EXE_UNIXCL)
+	EXE_CL=$(EXE_MACOSXCL)
 	EXE_SV=$(EXE_UNIXSV)
 	EXE_SDL=$(EXE_UNIXSDL)
 endif
 
 # SunOS configuration (Solaris)
 ifeq ($(DP_MAKE_TARGET), sunos)
-	DEFAULT_SNDAPI=$(DEFAULT_SNDAPI_SUNOS)
+	DEFAULT_SNDAPI=BSD
 	OBJ_CD=$(OBJ_SUNOSCD)
 
 	OBJ_CL=$(OBJ_GLX)
@@ -101,9 +101,9 @@ endif
 # BSD configuration
 ifeq ($(DP_MAKE_TARGET), bsd)
 ifeq ($(DP_ARCH),FreeBSD)
-	DEFAULT_SNDAPI=$(DEFAULT_SNDAPI_OSS)
+	DEFAULT_SNDAPI=OSS
 else
-	DEFAULT_SNDAPI=$(DEFAULT_SNDAPI_BSD)
+	DEFAULT_SNDAPI=BSD
 endif
 	OBJ_CD=$(OBJ_BSDCD)
 
@@ -120,7 +120,7 @@ endif
 
 # Win32 configuration
 ifeq ($(DP_MAKE_TARGET), mingw)
-	DEFAULT_SNDAPI=$(DEFAULT_SNDAPI_WIN32)
+	DEFAULT_SNDAPI=WIN
 	OBJ_CD=$(OBJ_WINCD)
 
 	OBJ_CL=$(OBJ_WGL)