final fixes

rubenvb · Aug 5, 2012 · bc9ac71 · bc9ac71
1 parent 2af0f6d
commit bc9ac71
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/buildall.sh b/buildall.sh
@@ -38,10 +38,13 @@ sh ./buildmingw64mingw32.sh || exit 1
 #echo "Building Mac 64-bit to Windows 64-bit cross-compiler"
 #sh ./buildmac64mingw64.sh || exit 1
 
-#echo "Building linux 64-bit to Windows 32-bit dw2 cross-compiler"
-#sh ./buildlinux64mingw32-dw2.sh
+echo "Building linux 64-bit to Windows 32-bit dw2 cross-compiler"
+sh ./buildlinux64mingw32-dw2.sh
 #echo "Building linux 32-bit to Windows 32-bit dw2 cross-compiler"
 #sh ./buildlinux32mingw32-dw2.sh
+
+export PATH=$PWD/linux64mingw32-dw2/mingw32-dw2/bin:$PATH
+
 echo "Building Windows 32-bit to Windows 32-bit dw2 native compiler"
 sh ./buildmingw32mingw32-dw2.sh || exit 1
 #echo "Building Windows 64-bit to Windows 32-bit dw2 native compiler"

diff --git a/buildlinux32mingw32-dw2.sh b/buildlinux32mingw32-dw2.sh
@@ -17,4 +17,4 @@ export SHORT_NAME=mingw32-dw2
 export LONG_NAME=linux32mingw32-dw2
 
 # call main build script
-. ./scripts/buildfromcross.sh
+. ./scripts/buildcrossfromnative.sh
diff --git a/buildlinux64mingw32-dw2.sh b/buildlinux64mingw32-dw2.sh
@@ -17,4 +17,4 @@ export SHORT_NAME=mingw32-dw2
 export LONG_NAME=linux64mingw32-dw2
 
 # call main build script
-. ./scripts/buildfromcross.sh
+. ./scripts/buildcrossfromnative.sh
diff --git a/scripts/directories.sh b/scripts/directories.sh
@@ -10,7 +10,7 @@ export BUILD_DIR=$TOP_DIR/$LONG_NAME
 export PACKAGE_DIR=$TOP_DIR/packages
 export LOG_DIR=$BUILD_DIR/logs
 
-if [ [ "$HOST" == "i686-w64-mingw32" ] && [ "$SHORT_NAME" == "mingw32-dw2" ] ]
+if [ "$HOST" == "i686-w64-mingw32" ] && [ "$SHORT_NAME" == "mingw32-dw2" ]
 then
   export PREREQ_DIR=$TOP_DIR/prereq/$HOST-dw2
 else