X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fmingw%2Fsigrok-cross-mingw;fp=cross-compile%2Fmingw%2Fsigrok-cross-mingw;h=bae165f0a2d4045761aaf887c236f3b03b7ed997;hp=c6d95d3534340aa8614b163ada0b949b15a12bf7;hb=682d505b8b7d354c7b0dc1bd719a4f43e0f566c7;hpb=a4846659556372bb820f1b9354c9b8ef2fb62e83

diff --git a/cross-compile/mingw/sigrok-cross-mingw b/cross-compile/mingw/sigrok-cross-mingw
index c6d95d3..bae165f 100755
--- a/cross-compile/mingw/sigrok-cross-mingw
+++ b/cross-compile/mingw/sigrok-cross-mingw
@@ -74,7 +74,9 @@ fi
 
 if [ $DEBUG = 1 ]; then
 	# CFLAGS/CXXFLAGS contains "-g" per default for autotools projects.
-	CM="$CM -DCMAKE_BUILD_TYPE=Debug"
+	BUILD_TYPE="Debug"
+else
+	BUILD_TYPE="Release"
 fi
 
 # Remove build directory contents (if any) and create a new build dir.
@@ -213,11 +215,12 @@ cd ..
 $GIT_CLONE $REPO_BASE/pulseview
 cd pulseview
 cp ../../FileAssociation.nsh contrib
-if [ $DEBUG = 1 ]; then
-	# Allow a "DOS box" to open on Windows, it'll contain logging output.
-	patch -p1 < ../../pv_mwindows.patch
-fi
-$CMAKE -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -DDISABLE_WERROR=y -DENABLE_TESTS=y .
+$CMAKE \
+	-DCMAKE_INSTALL_PREFIX:PATH=$PREFIX \
+	-DCMAKE_BUILD_TYPE=$BUILD_TYPE \
+	-DDISABLE_WERROR=y \
+	-DENABLE_TESTS=y
+	.
 make $PARALLEL $V
 if [ $DEBUG = 1 ]; then
 	make install $V