ifndef DP_MAKE_TARGET
# Win32
-ifdef windir
+ifdef WINDIR
DP_MAKE_TARGET=mingw
else
LDFLAGS_SV=$(LDFLAGS_LINUXSV)
LDFLAGS_SDL=$(LDFLAGS_LINUXSDL)
- SDLCONFIG_CFLAGS=$(SDLCONFIG_UNIXCFLAGS)
- SDLCONFIG_LIBS=$(SDLCONFIG_UNIXLIBS)
- SDLCONFIG_STATICLIBS=$(SDLCONFIG_UNIXSTATICLIBS)
+ 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_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
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)
LDFLAGS_SV=$(LDFLAGS_SUNOSSV)
LDFLAGS_SDL=$(LDFLAGS_SUNOSSDL)
- SDLCONFIG_CFLAGS=$(SDLCONFIG_UNIXCFLAGS)
- SDLCONFIG_LIBS=$(SDLCONFIG_UNIXLIBS)
- SDLCONFIG_STATICLIBS=$(SDLCONFIG_UNIXSTATICLIBS)
+ 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_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
LDFLAGS_SV=$(LDFLAGS_BSDSV)
LDFLAGS_SDL=$(LDFLAGS_BSDSDL)
- SDLCONFIG_CFLAGS=$(SDLCONFIG_UNIXCFLAGS)
- SDLCONFIG_LIBS=$(SDLCONFIG_UNIXLIBS)
- SDLCONFIG_STATICLIBS=$(SDLCONFIG_UNIXSTATICLIBS)
+ 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_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)
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 #####
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)