Use separate project for winconsole and don't statically link Qt (fixes #870).

master
Torsten Paul 2014-12-16 23:15:11 +01:00
parent 93b6113edc
commit 1126a0ef17
4 changed files with 25 additions and 34 deletions

View File

@ -546,7 +546,3 @@ INSTALLS += icons
man.path = $$PREFIX/share/man/man1
man.extra = cp -f doc/openscad.1 \"\$(INSTALL_ROOT)$${man.path}/$${FULLNAME}.1\"
INSTALLS += man
CONFIG(winconsole) {
include(winconsole.pri)
}

View File

@ -254,8 +254,8 @@ case $OS in
echo "cant find $TARGET/openscad.exe. build failed. stopping."
exit
fi
# make console pipe-able openscad.com - see winconsole.pri for info
qmake CONFIG+=winconsole ../openscad.pro
# make console pipe-able openscad.com - see winconsole.pro for info
qmake ../winconsole.pro
make
if [ ! -e $TARGET/openscad.com ]; then
echo "cant find $TARGET/openscad.com. build failed. stopping."

View File

@ -1,28 +0,0 @@
# 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
}

23
winconsole.pro Normal file
View File

@ -0,0 +1,23 @@
# Windows console issues workaround stub.
#
# 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
TEMPLATE = app
TARGET = openscad_winconsole
FORMS =
HEADERS =
FLEXSOURCES =
BISONSOURCES =
RESOURCES =
SOURCES = src/winconsole.c
CONFIG -= qt
CONFIG += console # sets IMAGE_SUBSYSTEM_WINDOWS_CUI in binary
QMAKE_POST_LINK = cd $(DESTDIR) && mv openscad_winconsole.exe openscad.com