DP_PRELOAD_DEPENDENCIES=yes makefile option: when set, link against the libraries...

[xonotic/darkplaces.git] / makefile

diff --git a/makefile b/makefile
index bed6ab0d2b1dd6cebb86b7a5fa3acb76dd8efaa1..479d62bc0b282cd410dc953692e7b0fbdfc4c239 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,4 +1,4 @@
-#####  DP_MAKE_TARGET autodetection and arch specific variables ##### 
+#####  DP_MAKE_TARGET autodetection and arch specific variables #####
 
 ifndef DP_MAKE_TARGET
 
@@ -42,18 +42,20 @@ 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)
+       OBJ_ICON=
+       OBJ_ICON_NEXUIZ=
 
        LDFLAGS_CL=$(LDFLAGS_LINUXCL)
        LDFLAGS_SV=$(LDFLAGS_LINUXSV)
@@ -62,30 +64,44 @@ ifeq ($(DP_MAKE_TARGET), linux)
        EXE_CL=$(EXE_UNIXCL)
        EXE_SV=$(EXE_UNIXSV)
        EXE_SDL=$(EXE_UNIXSDL)
+       EXE_CLNEXUIZ=$(EXE_UNIXCLNEXUIZ)
+       EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ)
+       EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ)
 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)
+       OBJ_ICON=
+       OBJ_ICON_NEXUIZ=
 
        LDFLAGS_CL=$(LDFLAGS_MACOSXCL)
        LDFLAGS_SV=$(LDFLAGS_MACOSXSV)
        LDFLAGS_SDL=$(LDFLAGS_MACOSXSDL)
 
-       EXE_CL=$(EXE_UNIXCL)
+       EXE_CL=$(EXE_MACOSXCL)
        EXE_SV=$(EXE_UNIXSV)
        EXE_SDL=$(EXE_UNIXSDL)
+       EXE_CLNEXUIZ=$(EXE_MACOSXCLNEXUIZ)
+       EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ)
+       EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ)
+
+       ifeq ($(word 2, $(filter -arch, $(CC))), -arch)
+               CFLAGS_MAKEDEP=
+       endif
 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)
+       OBJ_ICON=
+       OBJ_ICON_NEXUIZ=
 
        CFLAGS_EXTRA=$(CFLAGS_SUNOS)
 
@@ -96,18 +112,23 @@ ifeq ($(DP_MAKE_TARGET), sunos)
        EXE_CL=$(EXE_UNIXCL)
        EXE_SV=$(EXE_UNIXSV)
        EXE_SDL=$(EXE_UNIXSDL)
+       EXE_CLNEXUIZ=$(EXE_UNIXCLNEXUIZ)
+       EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ)
+       EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ)
 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)
 
        OBJ_CL=$(OBJ_GLX)
+       OBJ_ICON=
+       OBJ_ICON_NEXUIZ=
 
        LDFLAGS_CL=$(LDFLAGS_BSDCL)
        LDFLAGS_SV=$(LDFLAGS_BSDSV)
@@ -116,14 +137,19 @@ endif
        EXE_CL=$(EXE_UNIXCL)
        EXE_SV=$(EXE_UNIXSV)
        EXE_SDL=$(EXE_UNIXSDL)
+       EXE_CLNEXUIZ=$(EXE_UNIXCLNEXUIZ)
+       EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ)
+       EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ)
 endif
 
 # Win32 configuration
 ifeq ($(DP_MAKE_TARGET), mingw)
-       DEFAULT_SNDAPI=$(DEFAULT_SNDAPI_WIN32)
+       DEFAULT_SNDAPI=WIN
        OBJ_CD=$(OBJ_WINCD)
 
        OBJ_CL=$(OBJ_WGL)
+       OBJ_ICON=darkplaces.o
+       OBJ_ICON_NEXUIZ=nexuiz.o
 
        LDFLAGS_CL=$(LDFLAGS_WINCL)
        LDFLAGS_SV=$(LDFLAGS_WINSV)
@@ -132,9 +158,11 @@ ifeq ($(DP_MAKE_TARGET), mingw)
        EXE_CL=$(EXE_WINCL)
        EXE_SV=$(EXE_WINSV)
        EXE_SDL=$(EXE_WINSDL)
+       EXE_CLNEXUIZ=$(EXE_WINCLNEXUIZ)
+       EXE_SVNEXUIZ=$(EXE_WINSVNEXUIZ)
+       EXE_SDLNEXUIZ=$(EXE_WINSDLNEXUIZ)
 endif
 
-
 ##### Sound configuration #####
 
 ifndef DP_SOUND_API
@@ -178,6 +206,27 @@ ifeq ($(DP_SOUND_API), WIN)
 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 #####
 
 DO_LD=$(CC) -o $@ $^ $(LDFLAGS)