fix bugs with bbox vs bbox traces (the collision box's planes didn't have correct...

[xonotic/darkplaces.git] / makefile

diff --git a/makefile b/makefile
index 62d13e4eb7c64d1cc1dbf5e07936c9a0c8cac1fc..e563564dc8e6aaea030f7b38049f427ab895dd35 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
 
@@ -14,9 +14,13 @@ ifneq ($(filter %BSD,$(DP_ARCH)),)
 else
 ifeq ($(DP_ARCH), Darwin)
        DP_MAKE_TARGET=macosx
+else
+ifeq ($(DP_ARCH), SunOS)
+       DP_MAKE_TARGET=sunos
 else
        DP_MAKE_TARGET=linux
 
+endif  # ifeq ($(DP_ARCH), SunOS)
 endif  # ifeq ($(DP_ARCH), Darwin)
 endif  # ifneq ($(filter %BSD,$(DP_ARCH)),)
 endif  # ifdef windir
@@ -38,19 +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)
-       OBJ_SOUND=$(OBJ_LINUXSOUND)
-       LIB_SOUND=$(LIB_LINUXSOUND)
+       DEFAULT_SNDAPI=ALSA
        OBJ_CD=$(OBJ_LINUXCD)
 
        OBJ_CL=$(OBJ_GLX)
+       OBJ_ICON=
+       OBJ_ICON_NEXUIZ=
 
        LDFLAGS_CL=$(LDFLAGS_LINUXCL)
        LDFLAGS_SV=$(LDFLAGS_LINUXSV)
@@ -59,37 +64,67 @@ 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)
-       OBJ_SOUND=$(OBJ_MACOSXSOUND)
-       LIB_SOUND=$(LIB_MACOSXSOUND)
+       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_MACOSXCL)
+       EXE_SV=$(EXE_UNIXSV)
+       EXE_SDL=$(EXE_UNIXSDL)
+       EXE_CLNEXUIZ=$(EXE_MACOSXCLNEXUIZ)
+       EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ)
+       EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ)
+endif
+
+# SunOS configuration (Solaris)
+ifeq ($(DP_MAKE_TARGET), sunos)
+       DEFAULT_SNDAPI=BSD
+       OBJ_CD=$(OBJ_SUNOSCD)
+
+       OBJ_CL=$(OBJ_GLX)
+       OBJ_ICON=
+       OBJ_ICON_NEXUIZ=
+
+       CFLAGS_EXTRA=$(CFLAGS_SUNOS)
+
+       LDFLAGS_CL=$(LDFLAGS_SUNOSCL)
+       LDFLAGS_SV=$(LDFLAGS_SUNOSSV)
+       LDFLAGS_SDL=$(LDFLAGS_SUNOSSDL)
+
        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)
-       OBJ_SOUND=$(OBJ_OSSSOUND)
-       LIB_SOUND=$(LIB_OSSSOUND)
+       DEFAULT_SNDAPI=OSS
 else
-       OBJ_SOUND=$(OBJ_BSDSOUND)
-       LIB_SOUND=$(LIB_BSDSOUND)
+       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)
@@ -98,15 +133,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)
-       OBJ_SOUND=$(OBJ_WINSOUND)
-       LIB_SOUND=$(LIB_WINSOUND)
+       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)
@@ -115,6 +154,52 @@ 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
+       DP_SOUND_API=$(DEFAULT_SNDAPI)
+endif
+
+# NULL: no sound
+ifeq ($(DP_SOUND_API), NULL)
+       OBJ_SOUND=$(OBJ_SND_NULL)
+       LIB_SOUND=$(LIB_SND_NULL)
+endif
+
+# OSS: Open Sound System
+ifeq ($(DP_SOUND_API), OSS)
+       OBJ_SOUND=$(OBJ_SND_OSS)
+       LIB_SOUND=$(LIB_SND_OSS)
+endif
+
+# ALSA: Advanced Linux Sound Architecture
+ifeq ($(DP_SOUND_API), ALSA)
+       OBJ_SOUND=$(OBJ_SND_ALSA)
+       LIB_SOUND=$(LIB_SND_ALSA)
+endif
+
+# COREAUDIO: Core Audio
+ifeq ($(DP_SOUND_API), COREAUDIO)
+       OBJ_SOUND=$(OBJ_SND_COREAUDIO)
+       LIB_SOUND=$(LIB_SND_COREAUDIO)
+endif
+
+# BSD: BSD / Sun audio API
+ifeq ($(DP_SOUND_API), BSD)
+       OBJ_SOUND=$(OBJ_SND_BSD)
+       LIB_SOUND=$(LIB_SND_BSD)
+endif
+
+# WIN: DirectX and Win32 WAVE output
+ifeq ($(DP_SOUND_API), WIN)
+       OBJ_SOUND=$(OBJ_SND_WIN)
+       LIB_SOUND=$(LIB_SND_WIN)
 endif