X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=bootstrap.sh;h=9497096ac31fbafc899dc00fda2ef37c3a46f9e7;hb=74ea8208bb1aa1d9afc9657a4cdfac6714241887;hp=9355b27e098264b0fc4d9de99d7a8f5f0f725c7a;hpb=217889f81407de43d8de469ad93e05b7d334ae0c;p=builder.git

diff --git a/bootstrap.sh b/bootstrap.sh
index 9355b27..9497096 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,5 +1,4 @@
 #!/bin/sh
-# $Id$
 
 set -e
 
@@ -7,6 +6,9 @@ INCLUDEDIR=temp/bootstrap/include
 REQUIRED="core datafile"
 CFLAGS="-I$INCLUDEDIR `pkg-config --cflags sigc++-2.0`"
 LIBS="`pkg-config --libs sigc++-2.0` -lpthread"
+if pkg-config --exists "sigc++-2.0 >= 2.5.1"; then
+	CFLAGS="$CFLAGS -std=c++11"
+fi
 MACHINE="`uname -m`"
 SYSTEM="`uname -s`"
 if [ "$MACHINE" = "x86_64" ]; then
@@ -14,7 +16,7 @@ if [ "$MACHINE" = "x86_64" ]; then
 else
 	MULTIARCH="i386-linux-gnu"
 fi
-if [ "$SYSTEM" = "Darwin" ]; then
+if [ "$SYSTEM" = "Darwin" -o "$SYSTEM" = "FreeBSD" ]; then
 	if which clang++ >/dev/null; then
 		COMPILER="clang++"
 	else
@@ -46,6 +48,18 @@ while [ "$1" ]; do
 	--keep-temp)
 		KEEP_TEMP=yes
 		;;
+	--compiler)
+		shift
+		COMPILER="$1"
+		CUSTOM_COMPILER=yes
+		;;
+	--compiler=*)
+		COMPILER="${1#--compiler=}"
+		CUSTOM_COMPILER=yes
+		;;
+	--debug)
+		DEBUG=-g
+		;;
 	*)
 		echo "Unknown option $1"
 		exit 1
@@ -63,13 +77,30 @@ mkdir -p "$INCLUDEDIR/msp"
 
 sources=source/*.cpp
 
+use_overlays="unix generic"
 missing=""
 for i in $REQUIRED; do
 	path=`ls -1d $LIBPATH/*$i* 2>/dev/null | head -n1`
 	if [ -z "$path"  -o ! -d "$path/source" ]; then
 		missing="$missing msp$i"
 	else
-		headers=`find $path/source \( -name windows -prune \) -o \( -name '*.h' -print \)`
+		if [ "`echo $path/source/*.cpp`" = "$path/source/*.cpp" ]; then
+			subdirs=`find "$path/source" -mindepth 1 -maxdepth 1 -type d`
+		else
+			subdirs="$path/source"
+		fi
+
+		check_overlay=""
+		for j in $use_overlays; do
+			[ -z "$check_overlay" ] || check_overlay="$check_overlay -o "
+			check_overlay="${check_overlay}-name $j"
+		done
+		findargs="$subdirs"
+		if [ "$check_overlay" ]; then
+			findargs="$findargs -mindepth 1 ( -type d ! ( $check_overlay ) -prune ) ,"
+		fi
+
+		headers=`find $findargs -name '*.h'`
 		for j in $headers; do
 			rel=${j#$path/source/}
 			comp=${rel%%/*}
@@ -79,7 +110,7 @@ for i in $REQUIRED; do
 			mkdir -p "$INCLUDEDIR/msp/$comp"
 			ln -sf $j "$INCLUDEDIR/msp/$comp/"
 		done
-		sources="$sources `find $path/source \( -name windows -prune \) -o \( -name '*.cpp' -print \)`"
+		sources="$sources `find $findargs -name '*.cpp'`"
 	fi
 done
 
@@ -97,12 +128,15 @@ for i in $sources; do
 	mv $obj $obj.o
 	obj=$obj.o
 	dir=${i%/*}
-	dir=${dir%/unix}
 	flags="$CFLAGS"
-	if [ -d "$dir/unix" ]; then
-		flags="$flags -iquote $dir -iquote $dir/unix"
-	fi
-	$COMPILER -c $i -o $obj $flags
+	for j in $use_overlays; do
+		dir=${dir%/$j}
+		if [ -d "$dir/$j" ]; then
+			flags="$flags -iquote $dir -iquote $dir/$j"
+			break
+		fi
+	done
+	$COMPILER -c $DEBUG $i -o $obj $flags
 	objects="$objects $obj"
 done
 $COMPILER $objects -o builder-stage1 $LIBS
@@ -117,4 +151,7 @@ ARGS=
 if [ "$PREFIX" ]; then
 	ARGS="$ARGS --prefix='$PREFIX'"
 fi
+if [ "$CUSTOM_COMPILER" = "yes" ]; then
+	ARGS="$ARGS CXX=$COMPILER"
+fi
 eval "./builder-stage1 $ARGS"