X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=cross-compile%2Fmingw%2Fsigrok-cross-mingw;h=4873c27f990db7fe677e07053f833002a6c167c7;hb=aaafb7ec3f8ae9ff03fda7b4783084b4e7cf8801;hp=0989a5f6829f4bd12f1205484cc2435ab563e3cd;hpb=749d40972a054f64d5008713dffa680160dacdf2;p=sigrok-util.git diff --git a/cross-compile/mingw/sigrok-cross-mingw b/cross-compile/mingw/sigrok-cross-mingw index 0989a5f..4873c27 100755 --- a/cross-compile/mingw/sigrok-cross-mingw +++ b/cross-compile/mingw/sigrok-cross-mingw @@ -1,8 +1,8 @@ -#!/bin/bash +#!/bin/sh ## ## This file is part of the sigrok-util project. ## -## Copyright (C) 2013-2014 Uwe Hermann +## Copyright (C) 2013-2016 Uwe Hermann ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -15,8 +15,7 @@ ## GNU General Public License for more details. ## ## You should have received a copy of the GNU General Public License -## along with this program; if not, write to the Free Software -## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +## along with this program; if not, see . ## set -e @@ -33,19 +32,22 @@ PREFIX=$HOME/sr_mingw # The path where to download files to and where to build packages. BUILDDIR=./build +# Edit this to control verbose build output. +# V="V=1 VERBOSE=1" + # Edit this to enable/disable/modify parallel compiles. PARALLEL="-j 2" +# Edit this to enable/disable debug builds. +DEBUG=0 + # You usually don't need to change anything below this line. # ----------------------------------------------------------------------------- -VER_LIBUSB_WIN32=1.2.6.0 -VER_ZADIG=v2.0.1.160 - SF_MIRROR=switch.dl.sourceforge.net -WGET="wget --quiet" +WGET="wget -c --quiet" GIT_CLONE="git clone --depth=1" # ----------------------------------------------------------------------------- @@ -53,19 +55,24 @@ GIT_CLONE="git clone --depth=1" # We need to find tools in the toolchain. export PATH=$MXE/usr/bin:$PATH -TOOLCHAIN_TRIPLET="$TARGET-w64-mingw32.static" +TOOLCHAIN_TRIPLET="$TARGET-w64-mingw32.static.posix" + +CMAKE="$TOOLCHAIN_TRIPLET-cmake" P="$PREFIX/lib/pkgconfig" P2="$MXE/usr/$TOOLCHAIN_TRIPLET/lib/pkgconfig" -C="--host=$TOOLCHAIN_TRIPLET --prefix=$PREFIX" -CM="-DCMAKE_TOOLCHAIN_FILE=$MXE/usr/$TOOLCHAIN_TRIPLET/share/cmake/mxe-conf.cmake" +C="--host=$TOOLCHAIN_TRIPLET --prefix=$PREFIX CPPFLAGS=-D__printf__=__gnu_printf__" L="--disable-shared --enable-static" -DDK="$MXE/usr/$TOOLCHAIN_TRIPLET/include/ddk" -if [ $TARGET == "i686" ]; then - export PKG_CONFIG_PATH_i686_w64_mingw32_static="$P:$P2" +if [ $TARGET = "i686" ]; then + export PKG_CONFIG_PATH_i686_w64_mingw32_static_posix="$P:$P2" else - export PKG_CONFIG_PATH_x86_64_w64_mingw32_static="$P:$P2" + export PKG_CONFIG_PATH_x86_64_w64_mingw32_static_posix="$P:$P2" +fi + +if [ $DEBUG = 1 ]; then + # CFLAGS/CXXFLAGS contains "-g" per default for autotools projects. + CM="$CM -DCMAKE_BUILD_TYPE=Debug" fi # Remove build directory contents (if any) and create a new build dir. @@ -111,45 +118,45 @@ EOF $WGET http://www.sigrok.org/tmp/python32_$TARGET.dll -O $PREFIX/python32.dll $WGET http://www.sigrok.org/tmp/python32_$TARGET.zip -O $PREFIX/python32.zip -# libusb0.dll (needs to be shipped with frontends) -$WGET -c http://$SF_MIRROR/project/libusb-win32/libusb-win32-releases/$VER_LIBUSB_WIN32/libusb-win32-bin-$VER_LIBUSB_WIN32.zip -unzip -q libusb-win32-bin-$VER_LIBUSB_WIN32.zip -cp -f libusb-win32-bin-$VER_LIBUSB_WIN32/bin/x86/libusb0_x86.dll $PREFIX/libusb0.dll - # Zadig (we ship this with frontends for easy driver switching). -$WGET -c http://$SF_MIRROR/project/libwdi/zadig/zadig_$VER_ZADIG.7z -$WGET -c http://$SF_MIRROR/project/libwdi/zadig/zadig_xp_$VER_ZADIG.7z -7zr e zadig_$VER_ZADIG.7z -7zr e zadig_xp_$VER_ZADIG.7z -cp -f zadig.exe zadig_xp.exe $PREFIX +$WGET http://zadig.akeo.ie/downloads/zadig.exe -O $PREFIX/zadig.exe +$WGET http://zadig.akeo.ie/downloads/zadig_xp.exe -O $PREFIX/zadig_xp.exe + +# libusb +$GIT_CLONE git://github.com/dickens/libusb -b event-abstraction-v4 +cd libusb +patch -p1 < ../../libusb_raw_io.patch +./bootstrap.sh +./configure $C $L +make -j1 $V +make install $V +cd .. # libserialport $GIT_CLONE git://sigrok.org/libserialport cd libserialport ./autogen.sh -CFLAGS="-I$DDK" ./configure $C $L -make $PARALLEL V=1 -make install +./configure $C $L +make $PARALLEL $V +make install $V cd .. # libsigrok $GIT_CLONE git://sigrok.org/libsigrok cd libsigrok -patch -p1 < ../../libsigrok_firmwaredir.patch ./autogen.sh ./configure $C $L -make $PARALLEL V=1 -make install +make $PARALLEL $V +make install $V cd .. # libsigrokdecode $GIT_CLONE git://sigrok.org/libsigrokdecode cd libsigrokdecode ./autogen.sh -patch -p1 < ../../srd_decodersdir.patch ./configure $C $L -make $PARALLEL V=1 -make install +make $PARALLEL $V +make install $V cd .. # sigrok-firmware @@ -158,7 +165,7 @@ cd sigrok-firmware ./autogen.sh # Nothing gets cross-compiled here, we just need 'make install' basically. ./configure --prefix=$PREFIX -make install +make install $V cd .. # sigrok-firmware-fx2lafw @@ -167,14 +174,14 @@ cd sigrok-firmware-fx2lafw ./autogen.sh # We're building the fx2lafw firmware on the host, no need to cross-compile. ./configure --prefix=$PREFIX -make $PARALLEL V=1 -make install +make $PARALLEL $V +make install $V cd .. # sigrok-dumps $GIT_CLONE git://sigrok.org/sigrok-dumps cd sigrok-dumps -make install DESTDIR=$PREFIX/share/sigrok-dumps +make install DESTDIR=$PREFIX/share/sigrok-dumps $V cd .. # sigrok-cli @@ -182,17 +189,25 @@ $GIT_CLONE git://sigrok.org/sigrok-cli cd sigrok-cli ./autogen.sh ./configure $C -make $PARALLEL V=1 -make install +make $PARALLEL $V +make install $V makensis -DHOME=$HOME contrib/sigrok-cli_cross.nsi cd .. # PulseView $GIT_CLONE git://sigrok.org/pulseview cd pulseview -cmake $CM -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -DDISABLE_WERROR=y . -make $PARALLEL VERBOSE=1 -make install +if [ $DEBUG = 1 ]; then + # Allow a "DOS box" to open on Windows, it'll contain logging output. + patch -p1 < ../../pv_mwindows.patch +fi +$CMAKE -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -DDISABLE_WERROR=y -DENABLE_TESTS=y . +make $PARALLEL $V +if [ $DEBUG = 1 ]; then + make install $V +else + make install/strip $V +fi makensis -DHOME=$HOME contrib/pulseview_cross.nsi cd ..