use dynamic eye position-centered bouncegrid when rendering in dynamic

[xonotic/darkplaces.git] / makefile

diff --git a/makefile b/makefile
index 479d62bc0b282cd410dc953692e7b0fbdfc4c239..7d3f73a3f29b043860cfe1df3b861504acfde199 100644 (file)
--- a/makefile
+++ b/makefile
@@ -3,7 +3,7 @@
 ifndef DP_MAKE_TARGET
 
 # Win32
-ifdef windir
+ifdef WINDIR
        DP_MAKE_TARGET=mingw
 else
 
@@ -61,12 +61,20 @@ ifeq ($(DP_MAKE_TARGET), linux)
        LDFLAGS_SV=$(LDFLAGS_LINUXSV)
        LDFLAGS_SDL=$(LDFLAGS_LINUXSDL)
 
+       SDLCONFIG_CFLAGS=$(SDLCONFIG_UNIXCFLAGS) $(SDLCONFIG_UNIXCFLAGS_X11)
+       SDLCONFIG_LIBS=$(SDLCONFIG_UNIXLIBS) $(SDLCONFIG_UNIXLIBS_X11)
+       SDLCONFIG_STATICLIBS=$(SDLCONFIG_UNIXSTATICLIBS) $(SDLCONFIG_UNIXSTATICLIBS_X11)
+
        EXE_CL=$(EXE_UNIXCL)
        EXE_SV=$(EXE_UNIXSV)
        EXE_SDL=$(EXE_UNIXSDL)
        EXE_CLNEXUIZ=$(EXE_UNIXCLNEXUIZ)
        EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ)
        EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ)
+
+       # libjpeg dependency (set these to "" if you want to use dynamic loading instead)
+       CFLAGS_LIBJPEG=-DLINK_TO_LIBJPEG
+       LIB_JPEG=-ljpeg
 endif
 
 # Mac OS X configuration
@@ -82,6 +90,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)
@@ -92,6 +104,11 @@ ifeq ($(DP_MAKE_TARGET), macosx)
        ifeq ($(word 2, $(filter -arch, $(CC))), -arch)
                CFLAGS_MAKEDEP=
        endif
+
+       # libjpeg dependency (set these to "" if you want to use dynamic loading instead)
+       # we don't currently link to libjpeg on Mac because the OS does not have an easy way to load libjpeg and we provide our own in the .app
+       CFLAGS_LIBJPEG=
+       LIB_JPEG=
 endif
 
 # SunOS configuration (Solaris)
@@ -109,12 +126,20 @@ ifeq ($(DP_MAKE_TARGET), sunos)
        LDFLAGS_SV=$(LDFLAGS_SUNOSSV)
        LDFLAGS_SDL=$(LDFLAGS_SUNOSSDL)
 
+       SDLCONFIG_CFLAGS=$(SDLCONFIG_UNIXCFLAGS) $(SDLCONFIG_UNIXCFLAGS_X11)
+       SDLCONFIG_LIBS=$(SDLCONFIG_UNIXLIBS) $(SDLCONFIG_UNIXLIBS_X11)
+       SDLCONFIG_STATICLIBS=$(SDLCONFIG_UNIXSTATICLIBS) $(SDLCONFIG_UNIXSTATICLIBS_X11)
+
        EXE_CL=$(EXE_UNIXCL)
        EXE_SV=$(EXE_UNIXSV)
        EXE_SDL=$(EXE_UNIXSDL)
        EXE_CLNEXUIZ=$(EXE_UNIXCLNEXUIZ)
        EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ)
        EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ)
+
+       # libjpeg dependency (set these to "" if you want to use dynamic loading instead)
+       CFLAGS_LIBJPEG=-DLINK_TO_LIBJPEG
+       LIB_JPEG=-ljpeg
 endif
 
 # BSD configuration
@@ -134,15 +159,51 @@ endif
        LDFLAGS_SV=$(LDFLAGS_BSDSV)
        LDFLAGS_SDL=$(LDFLAGS_BSDSDL)
 
+       SDLCONFIG_CFLAGS=$(SDLCONFIG_UNIXCFLAGS) $(SDLCONFIG_UNIXCFLAGS_X11)
+       SDLCONFIG_LIBS=$(SDLCONFIG_UNIXLIBS) $(SDLCONFIG_UNIXLIBS_X11)
+       SDLCONFIG_STATICLIBS=$(SDLCONFIG_UNIXSTATICLIBS) $(SDLCONFIG_UNIXSTATICLIBS_X11)
+
        EXE_CL=$(EXE_UNIXCL)
        EXE_SV=$(EXE_UNIXSV)
        EXE_SDL=$(EXE_UNIXSDL)
        EXE_CLNEXUIZ=$(EXE_UNIXCLNEXUIZ)
        EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ)
        EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ)
+
+       # libjpeg dependency (set these to "" if you want to use dynamic loading instead)
+       CFLAGS_LIBJPEG=-DLINK_TO_LIBJPEG
+       LIB_JPEG=-ljpeg
 endif
 
 # Win32 configuration
+ifeq ($(WIN32RELEASE), 1)
+#      TARGET=i686-pc-mingw32
+#      CC=$(TARGET)-g++
+#      WINDRES=$(TARGET)-windres
+       CPUOPTIMIZATIONS=-march=i686 -fno-math-errno -ffinite-math-only -fno-rounding-math -fno-signaling-nans -fno-trapping-math
+#       CPUOPTIMIZATIONS+=-DUSE_WSPIAPI_H -DSUPPORTIPV6
+       LDFLAGS_WINCOMMON=-Wl,--large-address-aware
+else
+       LDFLAGS_WINCOMMON=
+endif
+
+ifeq ($(WIN64RELEASE), 1)
+#      TARGET=x86_64-pc-mingw32
+#      CC=$(TARGET)-g++
+#      WINDRES=$(TARGET)-windres
+endif
+
+ifeq ($(D3D), 1)
+       CFLAGS_D3D=-DSUPPORTD3D -DSUPPORTDIRECTX
+       CFLAGS_WARNINGS=-Wall
+       LDFLAGS_D3D=-ld3d9
+else
+       CFLAGS_D3D=
+       CFLAGS_WARNINGS=-Wall -Wold-style-definition -Wstrict-prototypes -Wsign-compare -Wdeclaration-after-statement
+       LDFLAGS_D3D=
+endif
+
+
 ifeq ($(DP_MAKE_TARGET), mingw)
        DEFAULT_SNDAPI=WIN
        OBJ_CD=$(OBJ_WINCD)
@@ -155,12 +216,20 @@ 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)
        EXE_CLNEXUIZ=$(EXE_WINCLNEXUIZ)
        EXE_SVNEXUIZ=$(EXE_WINSVNEXUIZ)
        EXE_SDLNEXUIZ=$(EXE_WINSDLNEXUIZ)
+
+       # libjpeg dependency (set these to "" if you want to use dynamic loading instead)
+       CFLAGS_LIBJPEG=-DLINK_TO_LIBJPEG
+       LIB_JPEG=-ljpeg
 endif
 
 ##### Sound configuration #####
@@ -205,10 +274,14 @@ 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
+CFLAGS_MAKEDEP?=-MMD
 ifdef DP_FS_BASEDIR
        CFLAGS_FS=-DDP_FS_BASEDIR='\"$(DP_FS_BASEDIR)\"'
 else