X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=configure;h=2e2f2bedfc6b81bdec69f1f29a3ba84eea6639c3;hb=72815200c65ff4587df5e8da908b9281e044f1ca;hp=c238296e5651f30173500e4f01517e86c6d7fa80;hpb=42e3082637998150a8dc0251c5b846f78e1d4772;p=melted

diff --git a/configure b/configure
index c238296..2e2f2be 100755
--- a/configure
+++ b/configure
@@ -38,6 +38,7 @@ function build_config
 		echo "version=$version"
 		echo "prefix=$prefix"
 		echo "bindir=$prefix/bin"
+		echo "targetos=$targetos"
 
 		[ "$mmx" = "true" ] && 
 		echo "MMX_FLAGS=-DUSE_MMX"
@@ -51,11 +52,24 @@ function build_config
 		echo "TARGETARCH=-march=$cpu" &&
 		echo "TARGETCPU=-mcpu=$cpu"
 
-		[ "`uname`" = "Linux" ] &&
-		echo "LIBDL=-ldl"
-
 		echo "OPTIMISATIONS=-O4 -pipe -ffast-math -fomit-frame-pointer"
-		echo "CFLAGS+=-Wall \$(TARGETARCH) \$(TARGETCPU) \$(OPTIMISATIONS) \$(MMX_FLAGS) \$(DEBUG_FLAGS) \$(LARGE_FILE) -pthread"
+		echo "CFLAGS+=-Wall -fPIC -DPIC \$(TARGETARCH) \$(TARGETCPU) \$(OPTIMISATIONS) \$(MMX_FLAGS) \$(DEBUG_FLAGS) \$(LARGE_FILE)"
+
+		case $targetos in
+		Darwin)
+		echo "CFLAGS+=-D__DARWIN__"
+		echo "SHFLAGS=-dynamiclib"
+		;;
+		Linux)
+		echo "CFLAGS+=-pthread"
+		echo "SHFLAGS=-shared"
+		echo "LIBDL=-ldl"
+		echo "RDYNAMIC=-rdynamic"
+		;;
+		*)
+		;;
+		esac
+		echo "LIBSUF=$LIBSUF"
 	) > config.mak
 
 	echo "#!/bin/sh" > mlt-config
@@ -98,6 +112,23 @@ export mmx=true
 export gpl=false
 export cpu=
 
+# Determine OS
+targetos=$(uname -s)
+# Chose appropriate suffix for libraries
+case $targetos in
+	Darwin)
+	LIBSUF=".dylib"
+	mmx=false
+	;;
+	Linux)
+	LIBSUF=".so"
+	;;
+	*)
+	LIBSUF=".so"
+	;;
+esac
+export LIBSUF
+
 # Iterate through arguments
 for i in "$@"
 do
@@ -111,6 +142,12 @@ do
 	esac
 done
 
+# Double check mmx (may end up disabling mmx on non-linux platforms incorrectly)
+if [ "$mmx" = "true" ]
+then
+	grep mmx /proc/cpuinfo > /dev/null 2>&1 || mmx=false
+fi
+
 # Show help if requested
 [ $help = 1 ] && show_help || build_config