projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into windows
[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
..
616f89a
--- 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
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
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
export AR=$HOST-ar
export RANLIB=$HOST-ranlib
export CC=$HOST-gcc
@@
-26,8
+26,9
@@
BUILD_DIR=$BASE/build
BUILD_CACHE_FILE=$BUILD_DIR/c4che/_cache.py
TOOLS_DIR=$BASE/tools/windows_packaging
BUILD_CACHE_FILE=$BUILD_DIR/c4che/_cache.py
TOOLS_DIR=$BASE/tools/windows_packaging
+. ../define_versions.sh
+
APPNAME=`grep -m 1 '^APPNAME' $BASE/wscript | awk '{print $3}' | sed "s/'//g"`
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
# These are only relevant after a build
if test -f $BUILD_CACHE_FILE
@@
-35,9
+36,9
@@
then
# Figure out the Build Type
if grep -q "DEBUG = True" $BUILD_CACHE_FILE; then
DEBUG=1
# Figure out the Build Type
if grep -q "DEBUG = True" $BUILD_CACHE_FILE; then
DEBUG=1
- PACKAGE_DIR="$APPNAME-$
VERSION
-win32-dbg"
+ PACKAGE_DIR="$APPNAME-$
{version}
-win32-dbg"
else
else
- PACKAGE_DIR="$APPNAME-$
VERSION
-win32"
+ PACKAGE_DIR="$APPNAME-$
{version}
-win32"
fi
if grep -q "BUILD_TESTS = True" $BUILD_CACHE_FILE; then
fi
if grep -q "BUILD_TESTS = True" $BUILD_CACHE_FILE; then
@@
-48,4
+49,4
@@
then
fi
# put this somewhere better...
fi
# put this somewhere better...
-VIRT_IMAGE_PATH=$HOME/virt-images/winxp.raw
+VIRT_IMAGE_PATH=$HOME/
Data/
virt-images/winxp.raw