diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2013-10-11 13:25:37 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2013-10-11 13:33:38 -0700 |
| commit | 35952a59d0f8d15255177b8e3fa357ba1e1e02b4 (patch) | |
| tree | b9ed0a9384eb2f12b84e43ace4db4d739a924532 /packaging | |
| parent | 4a213bba41982f311777310834024a4caece64bf (diff) | |
| download | subsurface-35952a59d0f8d15255177b8e3fa357ba1e1e02b4.tar.gz | |
Get cross build to work again
...and re-enable silent mode by default for cross builds
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'packaging')
| -rwxr-xr-x | packaging/windows/mingw-make.sh | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/packaging/windows/mingw-make.sh b/packaging/windows/mingw-make.sh index 8bb891752..3d503bf0e 100755 --- a/packaging/windows/mingw-make.sh +++ b/packaging/windows/mingw-make.sh @@ -3,17 +3,13 @@ # just a small shell script that is used to invoke make with the right # parameters to cross compile a binary for Windows # -# the paths work for the default mingw32 install on OpenSUSE - adjust as +# the paths work for the default mingw32 install on Fedora - adjust as # necessary # force recreation of the nsi file in order to get the correct version # number -rm packaging/windows/subsurface.nsi +rm packaging/windows/subsurface.nsi > /dev/null 2>&1 export PATH=/usr/i686-w64-mingw32/sys-root/mingw/bin:$PATH -make CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ \ - PKGCONFIG=i686-w64-mingw32-pkg-config \ - PKG_CONFIG_PATH=/usr/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig/ \ - CROSS_PATH=/usr/i686-w64-mingw32/sys-root/mingw/ \ - XSLTCONFIG=/usr/i686-w64-mingw32/sys-root/mingw/bin/xslt-config \ - XML2CONFIG=/usr/i686-w64-mingw32/sys-root/mingw/bin/xml2-config install-cross-windows $@ +mingw32-qmake-qt4 CROSS_PATH=/usr/i686-w64-mingw32/sys-root/mingw +mingw32-make $@ |