From 2719a32a3cbfd0871b4e5f76751faff370871590 Mon Sep 17 00:00:00 2001 From: Dave Murphy Date: Wed, 30 Jan 2013 10:55:39 +0000 Subject: [PATCH] add changes for cross compiling 64bit windows toolchains --- build-devkit.sh | 18 +++++++++++++++++- cross-build-x86_64-w64-mingw32.sh | 3 +++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100755 cross-build-x86_64-w64-mingw32.sh diff --git a/build-devkit.sh b/build-devkit.sh index 7b5bd9b..79af82f 100755 --- a/build-devkit.sh +++ b/build-devkit.sh @@ -157,10 +157,14 @@ if [ "$CROSSBUILD" = "i686-w64-mingw32" ]; then export PKG_CONFIG_PATH=/opt/i686-w64-mingw32/mingw/lib/pkgconfig fi +if [ "$CROSSBUILD" = "i686-w64-mingw32" ]; then + export PKG_CONFIG_PATH=/opt/x86_64-w64-mingw32/mingw/lib/pkgconfig +fi + if [ "$BUILD_DKPRO_AUTOMATED" != "1" ] ; then echo - echo 'Ready to install '$package' in '$INSTALLDIR + echo 'Ready to install '$package' in '$prefix echo echo 'press return to continue' @@ -273,6 +277,18 @@ if [ "$CROSSBUILD" = "i686-w64-mingw32" ]; then $prefix/bin fi +if [ "$CROSSBUILD" = "x86_64-w64-mingw32" ]; then + if [ $VERSION -ne 3 ]; then + cp -v /opt/x86_64-w64-mingw32/mingw/lib/FreeImage.dll $prefix/bin + fi + if [ $VERSION -eq 1 ]; then + cp -v /opt/x86_64-mingw32/i686-w64-mingw32/bin/libusb-1.0.dll $prefix/bin + fi + cp -v /opt/x86_64-w64-mingw32/mingw/lib/libstdc++-6.dll \ + /opt/x86_64-w64-mingw32/mingw/lib/libgcc_s_sjlj-1.dll \ + $prefix/bin +fi + echo "stripping installed binaries" . ./strip_bins.sh diff --git a/cross-build-x86_64-w64-mingw32.sh b/cross-build-x86_64-w64-mingw32.sh new file mode 100755 index 0000000..d1c039e --- /dev/null +++ b/cross-build-x86_64-w64-mingw32.sh @@ -0,0 +1,3 @@ +#!/bin/bash +export CROSSBUILD=x86_64-w64-mingw32 +export PATH=/opt/x86_64-w64-mingw32/bin:$PATH