]> sigrok.org Git - sigrok-util.git/commitdiff
Revert "sigrok-cross-mingw: Build libusbx."
authorUwe Hermann <redacted>
Fri, 27 Dec 2013 01:04:14 +0000 (02:04 +0100)
committerUwe Hermann <redacted>
Fri, 27 Dec 2013 01:04:14 +0000 (02:04 +0100)
This reverts commit 6cc41785239777c83f5b8d02307ea4b43457d946.

Current MXE has libusb-1.0 already, no need to manually build it.

cross-compile/mingw/sigrok-cross-mingw

index b35a0040b5ae3511a8856aa48efbe3edb0bcc5d8..e401ab3441231d130a73d0bc152a24c160b3855c 100755 (executable)
@@ -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