summaryrefslogtreecommitdiff
path: root/win.pri
diff options
context:
space:
mode:
authorMarius Kintel <marius@kintel.net>2013-08-21 05:40:25 (GMT)
committerMarius Kintel <marius@kintel.net>2013-08-21 05:40:25 (GMT)
commit7db45a878b29788ff846eac7dedede294836a1bc (patch)
treef9e01f3aaf86006d195f7bc58488150c7e619009 /win.pri
parenta7396cc36fbd2269bc75b0632e659dd05149259b (diff)
parentf25ad73ea5fcc2abcf92d7cd1fbe44c072acd1f4 (diff)
Merge branch 'master' of github.com:openscad/openscad
Diffstat (limited to 'win.pri')
-rw-r--r--win.pri7
1 files changed, 6 insertions, 1 deletions
diff --git a/win.pri b/win.pri
index bb41b09..b5db515 100644
--- a/win.pri
+++ b/win.pri
@@ -5,7 +5,8 @@ win32*msvc* {
INCLUDEPATH += $$(MPIRDIR)
INCLUDEPATH += $$(MPFRDIR)
- DEFINES += _USE_MATH_DEFINES NOMINMAX _CRT_SECURE_NO_WARNINGS YY_NO_UNISTD_H
+ # don't know where the __WIN32__ is usually set
+ DEFINES += _USE_MATH_DEFINES NOMINMAX _CRT_SECURE_NO_WARNINGS YY_NO_UNISTD_H __WIN32__
# disable MSVC warnings that are of very low importance
# disable warning about too long decorated names
@@ -16,5 +17,9 @@ win32*msvc* {
QMAKE_CXXFLAGS += -wd4100
# lexer uses strdup() & other POSIX stuff
QMAKE_CXXFLAGS += -D_CRT_NONSTDC_NO_DEPRECATE
+ # Treat WChar_t as a builtin type, allows Qt to call boost funcions
+ QMAKE_CXXFLAGS += /Zc:wchar_t
+ # increases the number of sections in .obj file
+ QMAKE_CXXFLAGS += /bigobj
}
contact: Jan Huwald // Impressum