X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fmsys2%2Fsigrok-native-msys2;h=cc3b1c6fa2e498b6c4ce760cd1f2bb2d11ca3a15;hp=4d2ad5f752e6f7670b71a68b795cb8e7b32fd184;hb=34a60103dd99783cb0f6e4b85291fbbecb985fdc;hpb=9bcef9f4c50be9562e7cf55d25746b922a2dca2e;ds=sidebyside

diff --git a/cross-compile/msys2/sigrok-native-msys2 b/cross-compile/msys2/sigrok-native-msys2
index 4d2ad5f..cc3b1c6 100755
--- a/cross-compile/msys2/sigrok-native-msys2
+++ b/cross-compile/msys2/sigrok-native-msys2
@@ -46,6 +46,12 @@ VER_SIGROK_FIRMWARE_FX2LAFW=0.1.3
 
 # -----------------------------------------------------------------------------
 
+if [ $DEBUG = 1 ]; then
+	BUILD_TYPE="Debug"
+else
+	BUILD_TYPE="Release"
+fi
+
 P="$PREFIX/lib/pkgconfig"
 C="$C --prefix=$PREFIX"
 L="--disable-shared --enable-static"
@@ -71,10 +77,10 @@ if [ "x$1" = "xprepare" ]; then
   # Update package list, install/update all requirements.
   pacman -Sy
   pacman -S \
-	autoconf automake libtool make pkg-config wget patch \
-	$W-toolchain $W-glib2 $W-glibmm $W-libusb $W-check $W-boost \
+	autoconf automake autoconf-archive libtool make pkg-config wget patch \
+	$W-toolchain $W-glib2 $W-glibmm $W-libusb $W-libftdi $W-check $W-boost \
 	$W-libzip $W-doxygen $W-python3 $W-python3-numpy $W-python3-gobject \
-	$W-python3-setuptools $W-swig $W-qt5-static $W-cmake
+	$W-python3-setuptools $W-swig $W-qt5-static $W-cmake $W-nsis
   exit
 fi
 
@@ -107,7 +113,7 @@ cd libsigrok
 ./autogen.sh
 mkdir build
 cd build
-PKG_CONFIG_PATH=$P ../configure $C $L --disable-python
+PKG_CONFIG_PATH=$P PYTHON=python3 ../configure $C $L --disable-python
 $SB make $PARALLEL $V
 PYTHONPATH=$PYPATH $SB make install $V
 # $SB make check $V # TODO
@@ -162,10 +168,15 @@ $GIT_CLONE $REPO_BASE/pulseview
 cd pulseview
 mkdir build
 cd build
-PKG_CONFIG_PATH=$P $SB cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -DDISABLE_WERROR=y -DENABLE_TESTS=n ..
+PKG_CONFIG_PATH=$P $SB cmake \
+	-G "Unix Makefiles" \
+	-DCMAKE_INSTALL_PREFIX:PATH=$PREFIX \
+	-DCMAKE_BUILD_TYPE=$BUILD_TYPE \
+	-DDISABLE_WERROR=y \
+	-DENABLE_TESTS=n
+	..
 $SB make $PARALLEL $V
 make install $V
 # $SB make test $V # TODO
 # makensis -DHOME=$HOME contrib/pulseview_cross.nsi # TODO
 cd ../..
-