remove DP_LINK_TO_JPEG from makefile, as this is default now

[xonotic/darkplaces.git] / makefile

diff --git a/makefile b/makefile
index 32b30e4c28f9c4f7c9344642928c007ab642d9cc..43b062be296e37f806d644c93878ca3a769f9ad2 100644 (file)
--- a/makefile
+++ b/makefile
@@ -159,6 +159,33 @@ endif
 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 -DUSE_WSPIAPI_H
+       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)
@@ -183,14 +210,6 @@ ifeq ($(DP_MAKE_TARGET), mingw)
        EXE_SDLNEXUIZ=$(EXE_WINSDLNEXUIZ)
 endif
 
-ifeq ($(WIN32RELEASE), 1)
-       CPUOPTIMIZATIONS=-march=i686 -DSUPPORTDIRECTX -DUSE_WSPIAPI_H
-endif
-
-ifeq ($(WIN64RELEASE), 1)
-       CPUOPTIMIZATIONS=
-endif
-
 ##### Sound configuration #####
 
 ifndef DP_SOUND_API
@@ -259,14 +278,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)