X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fmsys2%2Fsigrok-native-msys2;h=cc3b1c6fa2e498b6c4ce760cd1f2bb2d11ca3a15;hp=81532124d88fe4c426079fe02f3de7d175e475c7;hb=34a60103dd99783cb0f6e4b85291fbbecb985fdc;hpb=b65a0b061de5a8f796b8a0bc447329913ff97c05

diff --git a/cross-compile/msys2/sigrok-native-msys2 b/cross-compile/msys2/sigrok-native-msys2
index 8153212..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"
@@ -58,6 +64,8 @@ W="mingw-w64-$TARGET"
 WGET="wget -c --quiet"
 GIT_CLONE="git clone --depth=1"
 
+REPO_BASE="git://sigrok.org"
+
 # Remove build directory contents (if any) and create a new build dir.
 rm -rf $BUILDDIR
 mkdir $BUILDDIR
@@ -69,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
 
@@ -88,7 +96,7 @@ make install $V
 cd ..
 
 # libserialport
-$GIT_CLONE git://sigrok.org/libserialport
+$GIT_CLONE $REPO_BASE/libserialport
 cd libserialport
 ./autogen.sh
 mkdir build
@@ -100,19 +108,19 @@ cd ../..
 
 # libsigrok
 mkdir -p $PYPATH
-$GIT_CLONE git://sigrok.org/libsigrok
+$GIT_CLONE $REPO_BASE/libsigrok
 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
 cd ../..
 
 # libsigrokdecode
-$GIT_CLONE git://sigrok.org/libsigrokdecode
+$GIT_CLONE $REPO_BASE/libsigrokdecode
 cd libsigrokdecode
 ./autogen.sh
 mkdir build
@@ -124,7 +132,7 @@ make install $V
 cd ../..
 
 # sigrok-firmware
-$GIT_CLONE git://sigrok.org/sigrok-firmware
+$GIT_CLONE $REPO_BASE/sigrok-firmware
 cd sigrok-firmware
 ./autogen.sh
 mkdir build
@@ -143,7 +151,7 @@ cd ..
 
 # TODO: Doesn't build, libsigrokdecode linking errors.
 # # sigrok-cli
-# $GIT_CLONE git://sigrok.org/sigrok-cli
+# $GIT_CLONE $REPO_BASE/sigrok-cli
 # cd sigrok-cli
 # ./autogen.sh
 # mkdir build
@@ -156,14 +164,19 @@ cd ..
 
 # TODO: Doesn't build, various linking errors.
 # PulseView
-$GIT_CLONE git://sigrok.org/pulseview
+$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 ../..
-