From: Uwe Hermann Date: Fri, 27 Dec 2013 01:04:14 +0000 (+0100) Subject: Revert "sigrok-cross-mingw: Build libusbx." X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=commitdiff_plain;h=b5f5503403d21d170f7a3cae40f3a7e3646951b2 Revert "sigrok-cross-mingw: Build libusbx." This reverts commit 6cc41785239777c83f5b8d02307ea4b43457d946. Current MXE has libusb-1.0 already, no need to manually build it. --- diff --git a/cross-compile/mingw/sigrok-cross-mingw b/cross-compile/mingw/sigrok-cross-mingw index b35a004..e401ab3 100755 --- a/cross-compile/mingw/sigrok-cross-mingw +++ b/cross-compile/mingw/sigrok-cross-mingw @@ -34,12 +34,6 @@ BUILDDIR=./sr_mingw_build # ----------------------------------------------------------------------------- -SF_MIRROR=switch.dl.sourceforge.net - -VER_LIBUSBX=1.0.17 - -# ----------------------------------------------------------------------------- - # We need to find tools in the toolchain and in the install directory. export PATH=$PREFIX/bin:$MXE/usr/bin:$PATH @@ -87,13 +81,6 @@ chmod 755 $PREFIX/bin/python3-config wget -c http://python.org/ftp/python/3.2.3/python-3.2.3.msi \ -O $PREFIX/python-3.2.3.msi -# libusbx -wget http://$SF_MIRROR/project/libusbx/releases/$VER_LIBUSBX/source/libusbx-$VER_LIBUSBX.tar.bz2 -tar xfj libusbx-$VER_LIBUSBX.tar.bz2 -cd libusbx-$VER_LIBUSBX -PKG_CONFIG_PATH_i686_pc_mingw32=$P ./configure $C $L && make install -cd .. - # libserialport git clone git://sigrok.org/libserialport cd libserialport