renamed prvm_startupreuseedicttime to prvm_reuseedicts_startuptime

[xonotic/darkplaces.git] / makefile

diff --git a/makefile b/makefile
index 299893bae932d5d0999f98d51436e3db72638fbf..4112001b6370f745356c7d1a0303c3f3c81eeeec 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,9 +42,9 @@ 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
 
 
@@ -54,14 +54,23 @@ ifeq ($(DP_MAKE_TARGET), linux)
        OBJ_CD=$(OBJ_LINUXCD)
 
        OBJ_CL=$(OBJ_GLX)
+       OBJ_ICON=
+       OBJ_ICON_NEXUIZ=
 
        LDFLAGS_CL=$(LDFLAGS_LINUXCL)
        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)
+       EXE_CLNEXUIZ=$(EXE_UNIXCLNEXUIZ)
+       EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ)
+       EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ)
 endif
 
 # Mac OS X configuration
@@ -70,22 +79,37 @@ ifeq ($(DP_MAKE_TARGET), macosx)
        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)
+       SDLCONFIG_CFLAGS=$(SDLCONFIG_MACOSXCFLAGS)
+       SDLCONFIG_LIBS=$(SDLCONFIG_MACOSXLIBS)
+       SDLCONFIG_STATICLIBS=$(SDLCONFIG_MACOSXSTATICLIBS)
+
+       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=OSS
+       DEFAULT_SNDAPI=BSD
        OBJ_CD=$(OBJ_SUNOSCD)
 
        OBJ_CL=$(OBJ_GLX)
+       OBJ_ICON=
+       OBJ_ICON_NEXUIZ=
 
        CFLAGS_EXTRA=$(CFLAGS_SUNOS)
 
@@ -93,9 +117,16 @@ 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)
+       EXE_CLNEXUIZ=$(EXE_UNIXCLNEXUIZ)
+       EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ)
+       EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ)
 endif
 
 # BSD configuration
@@ -108,14 +139,23 @@ endif
        OBJ_CD=$(OBJ_BSDCD)
 
        OBJ_CL=$(OBJ_GLX)
+       OBJ_ICON=
+       OBJ_ICON_NEXUIZ=
 
        LDFLAGS_CL=$(LDFLAGS_BSDCL)
        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)
+       EXE_CLNEXUIZ=$(EXE_UNIXCLNEXUIZ)
+       EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ)
+       EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ)
 endif
 
 # Win32 configuration
@@ -124,17 +164,25 @@ ifeq ($(DP_MAKE_TARGET), mingw)
        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)
        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)
+       EXE_CLNEXUIZ=$(EXE_WINCLNEXUIZ)
+       EXE_SVNEXUIZ=$(EXE_WINSVNEXUIZ)
+       EXE_SDLNEXUIZ=$(EXE_WINSDLNEXUIZ)
 endif
 
-
 ##### Sound configuration #####
 
 ifndef DP_SOUND_API
@@ -177,6 +225,39 @@ 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?=-MMD
+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
+
+ifdef DP_LINK_TO_LIBJPEG
+       LDFLAGS_LIBJPEG?=-ljpeg
+       LDFLAGS_CL+=$(LDFLAGS_LIBJPEG)
+       LDFLAGS_SV+=$(LDFLAGS_LIBJPEG)
+       LDFLAGS_SDL+=$(LDFLAGS_LIBJPEG)
+       CFLAGS_PRELOAD+=$(CFLAGS_LIBJPEG) -DLINK_TO_LIBJPEG
+endif
 
 ##### GNU Make specific definitions #####