Fix some signed/unsigned mess. Not a real problem though.

[xonotic/darkplaces.git] / makefile

diff --git a/makefile b/makefile
index 3e543f62e5390a71f5524a0833661df428047c63..bbd0a76d6ba04eabf5d13d1f4b38f0173805fe57 100644 (file)
--- a/makefile
+++ b/makefile
@@ -143,7 +143,7 @@ ifeq ($(DP_MAKE_TARGET), macosx)
        endif
 
        DP_LINK_ZLIB?=shared
-       DP_LINK_JPEG?=shared
+       DP_LINK_JPEG?=dlopen
        DP_LINK_ODE?=dlopen
        DP_LINK_CRYPTO?=dlopen
        DP_LINK_CRYPTO_RIJNDAEL?=dlopen
@@ -230,7 +230,7 @@ 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=-march=pentium3 -mfpmath=sse -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
@@ -329,7 +329,7 @@ ifeq ($(DP_LINK_CRYPTO_RIJNDAEL), shared)
        LIB_CRYPTO_RIJNDAEL=-ld0_rijndael
        CFLAGS_CRYPTO_RIJNDAEL=-DLINK_TO_CRYPTO_RIJNDAEL
 endif
-ifeq ($(DP_LINK_CRYPTO_RIJNDAEL), shared)
+ifeq ($(DP_LINK_CRYPTO_RIJNDAEL), dlopen)
        LIB_CRYPTO_RIJNDAEL=
        CFLAGS_CRYPTO_RIJNDAEL=
 endif