finished merge of cairocanvas with windows and windows+cc branches

[ardour.git] / tools / windows_packaging / mingw-env.sh

diff --git a/tools/windows_packaging/mingw-env.sh b/tools/windows_packaging/mingw-env.sh
old mode 100644 (file)
new mode 100755 (executable)
index c6747ae..983e6d0
--- a/tools/windows_packaging/mingw-env.sh
+++ b/tools/windows_packaging/mingw-env.sh
@@ -5,12 +5,12 @@ BASE=$(dirname $BASE) # up one
 BASE=$(dirname $BASE) # up one more
 BASE=$(dirname $BASE) # up one more
 
-HOST=i686-pc-mingw32
+HOST=i686-w64-mingw32
 MINGW_ROOT=/usr/$HOST/sys-root/mingw
 
 export PKG_CONFIG_PREFIX=$MINGW_ROOT
 export PKG_CONFIG_LIBDIR=$MINGW_ROOT/lib/pkgconfig
-export PKGCONFIG=mingw32-pkg-config
+export PKGCONFIG=pkg-config
 export AR=$HOST-ar
 export RANLIB=$HOST-ranlib
 export CC=$HOST-gcc
@@ -27,17 +27,17 @@ BUILD_CACHE_FILE=$BUILD_DIR/c4che/_cache.py
 TOOLS_DIR=$BASE/tools/windows_packaging
 
 APPNAME=`grep -m 1 '^APPNAME' $BASE/wscript | awk '{print $3}' | sed "s/'//g"`
-VERSION=`grep -m 1 '^VERSION' $BASE/wscript | awk '{print $3}' | sed "s/'//g"`
 
 # These are only relevant after a build
 if test -f $BUILD_CACHE_FILE
 then
+        . ../define_versions.sh
+
        # Figure out the Build Type
-       if grep -q "DEBUG = True" $BUILD_CACHE_FILE; then
-               DEBUG=1
-               PACKAGE_DIR="$APPNAME-$VERSION-win32-dbg"
+       if [ x$DEBUG = xT ]; then
+               PACKAGE_DIR="$APPNAME-${release_version}-win32-dbg"
        else
-               PACKAGE_DIR="$APPNAME-$VERSION-win32"
+               PACKAGE_DIR="$APPNAME-${release_version}-win32"
        fi
 
        if grep -q "BUILD_TESTS = True" $BUILD_CACHE_FILE; then
@@ -46,6 +46,3 @@ then
 
        ARDOUR_DATA_DIR=$PACKAGE_DIR/share/ardour3
 fi
-
-# put this somewhere better...
-VIRT_IMAGE_PATH=$HOME/virt-images/winxp.raw