sigrok-cross-mingw: Allow for debug builds (default = off).

diff --git a/cross-compile/mingw/pv_mwindows.patch b/cross-compile/mingw/pv_mwindows.patch
new file mode 100644 (file)
index 0000000..65cd770
--- /dev/null
+++ b/cross-compile/mingw/pv_mwindows.patch
@@ -0,0 +1,16 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 80e90e9..d1a564f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -398,11 +398,6 @@ endif()
+ 
+ target_link_libraries(${PROJECT_NAME} ${PULSEVIEW_LINK_LIBS})
+ 
+-if(WIN32)
+-      # Pass -mwindows so that no "DOS box" opens when PulseView is started.
+-      set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "-mwindows")
+-endif()
+-
+ #===============================================================================
+ #= Installation
+ #-------------------------------------------------------------------------------

diff --git a/cross-compile/mingw/sigrok-cross-mingw b/cross-compile/mingw/sigrok-cross-mingw
index b324429aa2deb50278c7776495944c8b17899f2b..86e4486646a2950dfa2bf45b9b2231cd1204e138 100755 (executable)
--- 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-2014 Uwe Hermann <uwe@hermann-uwe.de>
+## Copyright (C) 2013-2016 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
@@ -39,6 +39,9 @@ BUILDDIR=./build
 # Edit this to enable/disable/modify parallel compiles.
 PARALLEL="-j 2"
 
+# Edit this to enable/disable debug builds.
+DEBUG=0
+
 # You usually don't need to change anything below this line.
 
 # -----------------------------------------------------------------------------
@@ -67,6 +70,11 @@ 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
@@ -189,9 +197,18 @@ cd ..
 # PulseView
 $GIT_CLONE git://sigrok.org/pulseview
 cd pulseview
+if [ $DEBUG = 1 ]; then
+       # Allow a "DOS box" to open on Windows, it'll contain logging output.
+       patch -p1 < ../../pv_mwindows.patch
+fi
 cmake $CM -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -DDISABLE_WERROR=y -DENABLE_TESTS=y .
+exit
 make $PARALLEL $V
-make install/strip $V
+if [ $DEBUG = 1 ]; then
+       make install $V
+else
+       make install/strip $V
+fi
 makensis -DHOME=$HOME contrib/pulseview_cross.nsi
 cd ..