summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Lubomir I. Ivanov <neolit123@gmail.com>2013-10-10 17:07:24 +0300
committerGravatar Dirk Hohndel <dirk@hohndel.org>2013-10-10 07:14:59 -0700
commit8b517f80817c837cd5efe815fc40315409be14a1 (patch)
tree5566b91b184e2676dd6bea8d6ea98506ac87eb2b
parent1dccf84c678b4d91ac4efeab3432360ce0aa1cbc (diff)
downloadsubsurface-8b517f80817c837cd5efe815fc40315409be14a1.tar.gz
subsurface-configure.pri: disable auto-"silent" mode for win32
Certain versions of mingw32-make will try to "CreateProcess" passing the contents of CC and CXX. On win32, with CONFIG += silent CC and CXX become composite containing multiple commands such as "@echo... && gcc", which produces undesired results. For the time being, do not automatically enable "silent" mode if the current OS is win32. Possibly a better solution can be found later on. Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--subsurface-configure.pri2
1 files changed, 1 insertions, 1 deletions
diff --git a/subsurface-configure.pri b/subsurface-configure.pri
index dc98867a3..51ff16dbc 100644
--- a/subsurface-configure.pri
+++ b/subsurface-configure.pri
@@ -126,7 +126,7 @@ win32 {
#
# misc
#
-!equals(V, 1): CONFIG += silent
+!equals(V, 1): !win32: CONFIG += silent
MOC_DIR = .moc
UI_DIR = .uic
RCC_DIR = .rcc