Merge branch 'master' and fix bugs

Conflicts:
	src/openscad.cc
	tests/CMakeLists.txt

1 files changed, 28 insertions, 0 deletions

diff --git a/winconsole.pri b/winconsole.pri
new file mode 100644
index 0000000..a3991ae
--- /dev/null
+++ b/winconsole.pri
@@ -0,0 +1,28 @@
+# Windows console issues workaround stub. 
+#
+# Usage: put at the end of .pro file, then run qmake CONFIG+=winconsole
+#
+# This attempts to solve the problem of piping OpenSCAD under windows 
+# command line (GUI mode programs in Windows dont allow this). We use 
+# the 'devenv' solution, which means building two binaries: 
+# openscad.exe, and openscad.com, the latter being a wrapper for the 
+# former. See src/winconsole.c for more details.
+#
+# Qmake doesn't like building two binaries in the same directory so we
+# depend on release-common.sh to call qmake twice and package the file properly
+
+CONFIG(winconsole) {
+  TEMPLATE = app
+  TARGET = openscad_winconsole
+  FORMS =
+  HEADERS =
+  FLEXSOURCES =
+  BISONSOURCES =
+  RESOURCES =
+  SOURCES = src/winconsole.c
+  CONFIG += console # sets IMAGE_SUBSYSTEM_WINDOWS_CUI in binary
+  LIBS -= $$LIBS
+  RC_FILE -= $$RC_FILE
+  QMAKE_POST_LINK = cd $(DESTDIR) && mv openscad_winconsole.exe openscad.com
+}
+