X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=makefile;h=5c95d05523348b250e2fc4c1c8ebd4fdde94996e;hb=7a96ec58916ceea50684acf4c00eaef551199fef;hp=ba1b76edfa6b7a976ea9dbb5f4e166b778b04ec1;hpb=5fb951ab4555f21c9f449157cf0ef42bde065593;p=xonotic%2Fdarkplaces.git

diff --git a/makefile b/makefile
index ba1b76ed..5c95d055 100644
--- a/makefile
+++ b/makefile
@@ -26,8 +26,6 @@ endif  # ifneq ($(filter %BSD,$(DP_ARCH)),)
 endif  # ifdef windir
 endif  # ifndef DP_MAKE_TARGET
 
-CFLAGS_MAKEDEP=-MD
-
 # If we're not on compiling for Win32, we need additional information
 ifneq ($(DP_MAKE_TARGET), mingw)
 	DP_ARCH:=$(shell uname)
@@ -63,6 +61,10 @@ ifeq ($(DP_MAKE_TARGET), linux)
 	LDFLAGS_SV=$(LDFLAGS_LINUXSV)
 	LDFLAGS_SDL=$(LDFLAGS_LINUXSDL)
 
+	SDLCONFIG_CFLAGS=$(SDLCONFIG_UNIXCFLAGS)
+	SDLCONFIG_LIBS=$(SDLCONFIG_UNIXLIBS)
+	SDLCONFIG_STATICLIBS=$(SDLCONFIG_UNIXSTATICLIBS)
+
 	EXE_CL=$(EXE_UNIXCL)
 	EXE_SV=$(EXE_UNIXSV)
 	EXE_SDL=$(EXE_UNIXSDL)
@@ -84,6 +86,10 @@ ifeq ($(DP_MAKE_TARGET), macosx)
 	LDFLAGS_SV=$(LDFLAGS_MACOSXSV)
 	LDFLAGS_SDL=$(LDFLAGS_MACOSXSDL)
 
+	SDLCONFIG_CFLAGS=$(SDLCONFIG_MACOSXCFLAGS)
+	SDLCONFIG_LIBS=$(SDLCONFIG_MACOSXLIBS)
+	SDLCONFIG_STATICLIBS=$(SDLCONFIG_MACOSXSTATICLIBS)
+
 	EXE_CL=$(EXE_MACOSXCL)
 	EXE_SV=$(EXE_UNIXSV)
 	EXE_SDL=$(EXE_UNIXSDL)
@@ -111,6 +117,10 @@ ifeq ($(DP_MAKE_TARGET), sunos)
 	LDFLAGS_SV=$(LDFLAGS_SUNOSSV)
 	LDFLAGS_SDL=$(LDFLAGS_SUNOSSDL)
 
+	SDLCONFIG_CFLAGS=$(SDLCONFIG_UNIXCFLAGS)
+	SDLCONFIG_LIBS=$(SDLCONFIG_UNIXLIBS)
+	SDLCONFIG_STATICLIBS=$(SDLCONFIG_UNIXSTATICLIBS)
+
 	EXE_CL=$(EXE_UNIXCL)
 	EXE_SV=$(EXE_UNIXSV)
 	EXE_SDL=$(EXE_UNIXSDL)
@@ -136,6 +146,10 @@ endif
 	LDFLAGS_SV=$(LDFLAGS_BSDSV)
 	LDFLAGS_SDL=$(LDFLAGS_BSDSDL)
 
+	SDLCONFIG_CFLAGS=$(SDLCONFIG_UNIXCFLAGS)
+	SDLCONFIG_LIBS=$(SDLCONFIG_UNIXLIBS)
+	SDLCONFIG_STATICLIBS=$(SDLCONFIG_UNIXSTATICLIBS)
+
 	EXE_CL=$(EXE_UNIXCL)
 	EXE_SV=$(EXE_UNIXSV)
 	EXE_SDL=$(EXE_UNIXSDL)
@@ -157,6 +171,10 @@ ifeq ($(DP_MAKE_TARGET), mingw)
 	LDFLAGS_SV=$(LDFLAGS_WINSV)
 	LDFLAGS_SDL=$(LDFLAGS_WINSDL)
 
+	SDLCONFIG_CFLAGS=$(SDLCONFIG_UNIXCFLAGS)
+	SDLCONFIG_LIBS=$(SDLCONFIG_UNIXLIBS)
+	SDLCONFIG_STATICLIBS=$(SDLCONFIG_UNIXSTATICLIBS)
+
 	EXE_CL=$(EXE_WINCL)
 	EXE_SV=$(EXE_WINSV)
 	EXE_SDL=$(EXE_WINSDL)
@@ -165,7 +183,6 @@ ifeq ($(DP_MAKE_TARGET), mingw)
 	EXE_SDLNEXUIZ=$(EXE_WINSDLNEXUIZ)
 endif
 
-
 ##### Sound configuration #####
 
 ifndef DP_SOUND_API
@@ -208,6 +225,31 @@ ifeq ($(DP_SOUND_API), WIN)
 	LIB_SOUND=$(LIB_SND_WIN)
 endif
 
+ifeq ($(DP_SOUND_API),3DRAS)
+	OBJ_SOUND=$(OBJ_SND_3DRAS)
+	LIB_SOUND=$(LIB_SND_3DRAS)
+endif
+
+##### Extra CFLAGS #####
+
+CFLAGS_MAKEDEP?=-MD
+ifdef DP_FS_BASEDIR
+	CFLAGS_FS=-DDP_FS_BASEDIR='\"$(DP_FS_BASEDIR)\"'
+else
+	CFLAGS_FS=
+endif
+
+CFLAGS_PRELOAD=
+ifneq ($(DP_MAKE_TARGET), mingw)
+ifdef DP_PRELOAD_DEPENDENCIES
+# DP_PRELOAD_DEPENDENCIES: when set, link against the libraries needed using -l
+# dynamically so they won't get loaded at runtime using dlopen
+	LDFLAGS_CL+=$(LDFLAGS_UNIXCL_PRELOAD)
+	LDFLAGS_SV+=$(LDFLAGS_UNIXSV_PRELOAD)
+	LDFLAGS_SDL+=$(LDFLAGS_UNIXSDL_PRELOAD)
+	CFLAGS_PRELOAD=$(CFLAGS_UNIX_PRELOAD)
+endif
+endif
 
 ##### GNU Make specific definitions #####