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
# 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
+ 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=
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 #####