X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=bootstrap.sh;fp=bootstrap.sh;h=5cb40121f4fae3a03d9dac81201259850390a538;hb=c51e8844f19c31b2809ba459a1659d3b94a86f89;hp=70d032399886d10d9bd983342a426e47866be271;hpb=483add89e7f305642cc88a5f63a7741a15b6290e;p=builder.git

diff --git a/bootstrap.sh b/bootstrap.sh
index 70d0323..5cb4012 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -61,7 +61,7 @@ for i in $REQUIRED; do
 		else
 			ln -sf $path/source "$INCLUDEDIR/msp/$i"
 		fi
-		sources="$sources `find $path/source -name '*.cpp'`"
+		sources="$sources `find $path/source \( -name windows -prune \) -o \( -name '*.cpp' -print \)`"
 	fi
 done
 
@@ -72,6 +72,10 @@ if [ ! -z "$missing" ]; then
 	exit 1
 fi
 
+for i in "$INCLUDEDIR/msp/"*/unix; do
+	CFLAGS="$CFLAGS -iquote $i -iquote ${i%/unix}"
+done
+
 echo "Compiling builder-stage1.  This may take several minutes."
 g++ $sources -o builder-stage1 $CFLAGS $LIBS
 echo "Using builder-stage1 to compile builder."