Merge branch 'master' into boost_filesystem

Conflicts:
	boost.pri
	tests/CMakeLists.txt

1 files changed, 20 insertions, 0 deletions

diff --git a/win32.pri b/win32.pri
new file mode 100644
index 0000000..bb41b09
--- /dev/null
+++ b/win32.pri
@@ -0,0 +1,20 @@
+# win32-specific MSVC compiler general settings
+
+win32*msvc* {
+  #configure additional directories
+  INCLUDEPATH += $$(MPIRDIR)
+  INCLUDEPATH += $$(MPFRDIR)
+
+  DEFINES += _USE_MATH_DEFINES NOMINMAX _CRT_SECURE_NO_WARNINGS YY_NO_UNISTD_H
+
+  # disable MSVC warnings that are of very low importance
+  # disable warning about too long decorated names
+  QMAKE_CXXFLAGS += -wd4503
+  # CGAL casting int to bool
+  QMAKE_CXXFLAGS += -wd4800
+  # CGAL's unreferenced formal parameters
+  QMAKE_CXXFLAGS += -wd4100
+  # lexer uses strdup() & other POSIX stuff
+  QMAKE_CXXFLAGS += -D_CRT_NONSTDC_NO_DEPRECATE
+
+}