X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=configure;h=72bbfe51d974b6d96bc69e0f9b317546b8faa3f5;hb=a9a40d6f3401300fd9ba297763e15e7e5f893f2c;hp=dce184f6e2041fd74844f92cf194e656517e7d8d;hpb=adc69f31080e8ab1dc2c9126ecef104ce1f2494b;p=melted

diff --git a/configure b/configure
index dce184f..72bbfe5 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-export version=0.3.3
+export version=0.3.9
 export soversion=1
 
 show_help()
@@ -20,7 +20,8 @@ General build options:
   --disable-debug         - Compile without debug support (default: on)
   --disable-mmx           - Compile without MMX support (default: on)
   --disable-sse           - Compile without SSE support (default: on)
-  --cpu='cpu'             - Compile for a specific CPU/architectre (default: none)
+  --arch='arch'             - Compile for a specific architecture (default: none)
+  --cpu='cpu'             - Compile for a specific CPU (default: none)
 
 Module disables options:
 
@@ -58,20 +59,21 @@ build_config()
 
 		echo "LARGE_FILE=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
 
-		[ "$cpu" != "" ] &&
-		echo "TARGETARCH=-march=$cpu" &&
-		echo "TARGETCPU=-mcpu=$cpu"
-		echo "OPTIMISATIONS=-O3 -pipe -fomit-frame-pointer"
+		[ "$arch" != "" ] && echo "TARGETARCH=-march=$arch"
+		[ "$cpu" != "" ] && echo "TARGETCPU=-mcpu=$cpu"
+		echo "OPTIMISATIONS=-O2 -pipe -fomit-frame-pointer"
 
 		echo "CFLAGS+=-Wall -fPIC -DPIC \$(TARGETARCH) \$(TARGETCPU) \$(OPTIMISATIONS) \$(MMX_FLAGS) \$(SSE_FLAGS) \$(DEBUG_FLAGS) \$(LARGE_FILE)"
 
 		case $targetos in
 		Darwin)
+		sysctl -a hw | grep "x86_64: 1" > /dev/null && echo "ARCH_X86_64=1" && echo "CFLAGS+=-DARCH_X86_64"
 		echo "CFLAGS+=-D__DARWIN__ `sdl-config --cflags`"
 		echo "SHFLAGS=-dynamiclib"
 		echo "LDFLAGS+=`sdl-config --libs`"
 		;;
 		Linux)
+		[ "$(uname -m)" = "x86_64" ] && echo "ARCH_X86_64=1" && echo "CFLAGS+=-DARCH_X86_64"
 		echo "OPTIMISATIONS+=-ffast-math"
 		echo "CFLAGS+=-pthread"
 		echo "SHFLAGS=-shared"
@@ -79,6 +81,7 @@ build_config()
 		echo "RDYNAMIC=-rdynamic"
 		;;
 		FreeBSD)
+		[ "$(uname -m)" = "x86_64" ] && echo "ARCH_X86_64=1" && echo "CFLAGS+=-DARCH_X86_64"
 		echo "OPTIMISATIONS+=-ffast-math"
 		echo "CFLAGS+=-pthread"
 		echo "SHFLAGS=-shared"
@@ -132,6 +135,7 @@ export debug=true
 export mmx=true
 export sse=true
 export gpl=false
+export arch=
 export cpu=
 export targetos=
 
@@ -159,9 +163,10 @@ do
 		--prefix=* )		prefix="${i#--prefix=}" ;;
 		--libdir=* )		libdir="${i#--libdir=}" ;;
 		--disable-debug )	debug=false ;;
-		--disable-mmx )		mmx=false ;;
+		--disable-mmx )		mmx=false; sse=false ;;
 		--disable-sse )		sse=false ;;
 		--enable-gpl )		gpl=true ;;
+		--arch=* )			arch="${i#--arch=}" ;;
 		--cpu=* )			cpu="${i#--cpu=}" ;;
 	esac
 done
@@ -169,12 +174,12 @@ done
 # Determine the libdir if it's not specified in the args
 [ "$libdir" = "" ] && libdir=$prefix/lib
 
-# Double check mmx (Linux and FreeBSD supported, may end up disabling mmx on other platforms incorrectly)
+# Double check MMX (Darwin, Linux and FreeBSD supported, may end up disabling MMX on other platforms incorrectly)
 if [ "$mmx" = "true" ]
 then
 	case $targetos in
 		Darwin)
-		sysctl -a hw | grep mmx: > /dev/null | mmx=false
+		sysctl -a hw | grep "mmx: 1" > /dev/null || mmx=false
 		;;
 		Linux)
 		grep mmx /proc/cpuinfo > /dev/null 2>&1 || mmx=false
@@ -188,12 +193,12 @@ then
 	esac
 fi
 
-# Double check SSE (Linux and FreeBSD supported, may end up disabling SSE on other platforms incorrectly)
+# Double check SSE (Darwin, Linux and FreeBSD supported, may end up disabling SSE on other platforms incorrectly)
 if [ "$sse" = "true" ]
 then
 	case $targetos in
 		Darwin)
-		sysctl -a hw | grep sse: > /dev/null | sse=false
+		sysctl -a hw | grep "sse: 1" > /dev/null || sse=false
 		;;
 		Linux)
 		grep sse /proc/cpuinfo > /dev/null 2>&1 || sse=false