+ PySide on Windows

2013-12-09 21:58:52 +01:00
parent 09d4b9fc5d
commit 8a923bac76
2 changed files with 55 additions and 27 deletions
--- a/src/Gui/WidgetFactory.cpp
+++ b/src/Gui/WidgetFactory.cpp
@@ -27,6 +27,15 @@
 #undef HAVE_SHIBOKEN
 #undef HAVE_PYSIDE

+#ifdef FC_OS_WIN32
+#undef max
+#undef min
+#ifdef _MSC_VER
+#pragma warning( disable : 4099 )
+#pragma warning( disable : 4522 )
+#endif
+#endif
+
 #ifdef HAVE_SHIBOKEN
 # undef _POSIX_C_SOURCE
 # undef _XOPEN_SOURCE