split and overhauled R_Upload into two functions:

[xonotic/darkplaces.git] / makefile

diff --git a/makefile b/makefile
index f137e9f3ddc65fb82f0ff2a13fcdc98b1c0523cb..ee88a37c4dabea2a868fa31a66fc7d03b981b4ee 100644 (file)
--- a/makefile
+++ b/makefile
@@ -3,7 +3,7 @@
 ifndef DP_MAKE_TARGET
 
 # Win32
-ifdef windir
+ifdef WINDIR
        DP_MAKE_TARGET=mingw
 else
 
@@ -71,6 +71,10 @@ ifeq ($(DP_MAKE_TARGET), linux)
        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
@@ -100,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)
@@ -127,6 +136,10 @@ ifeq ($(DP_MAKE_TARGET), sunos)
        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
@@ -156,9 +169,41 @@ endif
        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)
@@ -181,14 +226,10 @@ ifeq ($(DP_MAKE_TARGET), mingw)
        EXE_CLNEXUIZ=$(EXE_WINCLNEXUIZ)
        EXE_SVNEXUIZ=$(EXE_WINSVNEXUIZ)
        EXE_SDLNEXUIZ=$(EXE_WINSDLNEXUIZ)
-endif
 
-ifeq ($(WIN32RELEASE), 1)
-       CPUOPTIMIZATIONS=-march=i686 -DSUPPORTDIRECTX -DUSE_WSPIAPI_H
-endif
-
-ifeq ($(WIN64RELEASE), 1)
-       CPUOPTIMIZATIONS=
+       # libjpeg dependency (set these to "" if you want to use dynamic loading instead)
+       CFLAGS_LIBJPEG=-DLINK_TO_LIBJPEG
+       LIB_JPEG=-ljpeg
 endif
 
 ##### Sound configuration #####
@@ -259,14 +300,6 @@ ifdef DP_PRELOAD_DEPENDENCIES
 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 #####
 
 DO_LD=$(CC) -o $@ $^ $(LDFLAGS)