X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fmingw%2Fsigrok-cross-mingw;h=8330406ecd28969d8d29c8ad23df8968a4b9ec68;hp=c6d95d3534340aa8614b163ada0b949b15a12bf7;hb=8cf06ef35373da908f1a19e9a32a7939dc30f636;hpb=193646a8576db08e5b8ff460bfd4dd5310f58308

diff --git a/cross-compile/mingw/sigrok-cross-mingw b/cross-compile/mingw/sigrok-cross-mingw
index c6d95d3..8330406 100755
--- a/cross-compile/mingw/sigrok-cross-mingw
+++ b/cross-compile/mingw/sigrok-cross-mingw
@@ -2,7 +2,7 @@
 ##
 ## This file is part of the sigrok-util project.
 ##
-## Copyright (C) 2013-2017 Uwe Hermann <uwe@hermann-uwe.de>
+## Copyright (C) 2013-2018 Uwe Hermann <uwe@hermann-uwe.de>
 ##
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -26,11 +26,11 @@ TARGET="i686"
 # The path where your MXE directory is located.
 MXE=$HOME/mxe-git
 
-# The path where the cross-compiled packages will be installed.
-PREFIX=$HOME/sr_mingw
+# The base path prefix where the cross-compiled packages will be installed.
+PREFIXBASE=$HOME/sr_mingw
 
-# The path where to download files to and where to build packages.
-BUILDDIR=./build
+# The base path prefix where to download files to and where to build packages.
+BUILDBASE=./build
 
 # Edit this to control verbose build output.
 # V="V=1 VERBOSE=1"
@@ -45,13 +45,28 @@ DEBUG=0
 
 # -----------------------------------------------------------------------------
 
-SF_MIRROR=switch.dl.sourceforge.net
-
 WGET="wget -c --quiet"
 GIT_CLONE="git clone --depth=1"
 
 REPO_BASE="git://sigrok.org"
 
+# Construct the build and install directory pathnames.
+if [ $TARGET = "i686" ]; then
+	SUFFIX="32"
+else
+	SUFFIX="64"
+fi
+if [ $DEBUG = 1 ]; then
+	# CFLAGS/CXXFLAGS contains "-g" per default for autotools projects.
+	BUILD_TYPE="Debug"
+	PREFIX=$PREFIXBASE"_debug_"$SUFFIX
+	BUILDDIR=$BUILDBASE"_debug_"$SUFFIX
+else
+	BUILD_TYPE="Release"
+	PREFIX=$PREFIXBASE"_release_"$SUFFIX
+	BUILDDIR=$BUILDBASE"_release_"$SUFFIX
+fi
+
 # -----------------------------------------------------------------------------
 
 # We need to find tools in the toolchain.
@@ -72,11 +87,6 @@ else
 	export PKG_CONFIG_PATH_x86_64_w64_mingw32_static_posix="$P:$P2"
 fi
 
-if [ $DEBUG = 1 ]; then
-	# CFLAGS/CXXFLAGS contains "-g" per default for autotools projects.
-	CM="$CM -DCMAKE_BUILD_TYPE=Debug"
-fi
-
 # Remove build directory contents (if any) and create a new build dir.
 rm -rf $BUILDDIR
 mkdir $BUILDDIR
@@ -213,11 +223,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