mingw README: Mention libusb1 MXE package.

[sigrok-util.git] / cross-compile / mingw / sigrok-cross-mingw

diff --git a/cross-compile/mingw/sigrok-cross-mingw b/cross-compile/mingw/sigrok-cross-mingw
index 9258796f1b623c38c027128fc79245f8d7fb5374..767870992b454dc0dcc552602e27809becee7f60 100755 (executable)
--- a/cross-compile/mingw/sigrok-cross-mingw
+++ b/cross-compile/mingw/sigrok-cross-mingw
@@ -32,12 +32,6 @@ BUILDDIR=./sr_mingw_build
 
 # -----------------------------------------------------------------------------
 
-VER_LIBUSB_1_0=1.0.9
-
-SF_MIRROR=switch.dl.sourceforge.net
-
-# -----------------------------------------------------------------------------
-
 # We need to find tools in the toolchain and in the install directory.
 export PATH=$PREFIX/bin:$MXE/usr/bin:$PATH
 
@@ -54,13 +48,6 @@ cd $BUILDDIR
 
 # -----------------------------------------------------------------------------
 
-# libusb-1.0
-wget http://$SF_MIRROR/project/libusb/libusb-1.0/libusb-$VER_LIBUSB_1_0/libusb-$VER_LIBUSB_1_0.tar.bz2
-tar xfj libusb-$VER_LIBUSB_1_0.tar.bz2
-cd libusb-$VER_LIBUSB_1_0
-./configure $C $L && make install
-cd ..
-
 # Python3
 # Cross-compiling Python is highly non-trivial, so we avoid it for now.
 # The download below is a repackaged tarball of the official Python 3.2.3 MSI
@@ -92,7 +79,7 @@ chmod 755 $PREFIX/bin/python3-config
 git clone git://sigrok.org/libsigrok
 cd libsigrok
 ./autogen.sh
-PKG_CONFIG_PATH_i686_pc_mingw32=$P ./configure $C $L --disable-alsa --disable-link-mso19 && make install
+PKG_CONFIG_PATH_i686_pc_mingw32=$P ./configure $C $L && make install
 cd ..
 
 # libsigrokdecode
@@ -118,16 +105,17 @@ cd ..
 ## # TODO: make install
 ## cd ..
 
-# sigrok-gtk
-git clone git://sigrok.org/sigrok-gtk
-cd sigrok-gtk
-./autogen.sh
-PKG_CONFIG_PATH_i686_pc_mingw32=$P:$P2 ./configure $C && make install
-cd ..
+# # sigrok-gtk
+# git clone git://sigrok.org/sigrok-gtk
+# cd sigrok-gtk
+# ./autogen.sh
+# PKG_CONFIG_PATH_i686_pc_mingw32=$P:$P2 ./configure $C && make install
+# cd ..
 
 # PulseView
 git clone git://sigrok.org/pulseview
 cd pulseview
-LDFLAGS="-llzma -llcms" PKG_CONFIG_PATH_i686_pc_mingw32=$P:$P2 cmake $CM -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX . && make install
+# TODO: Append (not prepend) "-llzma -llcms" to the linker.
+PKG_CONFIG_PATH_i686_pc_mingw32=$P:$P2 cmake $CM -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -DDISABLE_WERROR=y . && make install VERBOSE=1
 cd ..