Merge pull request #9 from combolek/master

Visual Studio 2017 porting changes
Rhoban · Dec 4, 2019 · f1e40f2 · f1e40f2
2 parents 8c690c7 + 1eea94e
commit f1e40f2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/gui/main.cpp b/gui/main.cpp
@@ -1,5 +1,14 @@
 #include <QApplication>
 #include <QGLFormat>
+
+#if defined(QT_STATIC)
+#include <QtPlugin>
+#if defined(_WIN32)
+Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin);
+Q_IMPORT_PLUGIN(QWindowsVistaStylePlugin);
+#endif
+#endif
+
 #include "mainwindow.h"
 
 int main(int argc, char *argv[])

diff --git a/plater/util.cpp b/plater/util.cpp
@@ -1,10 +1,13 @@
-#if defined(_WIN32) || defined(_WIN64)
+#if defined(_WIN32)
 #include <direct.h>
+#else
+#include <unistd.h>
 #endif
+#include <cctype>
 #include <iostream>
 #include <sstream>
 #include <algorithm>
-#include <unistd.h>
+#include <functional>
 #include "util.h"
 
 #if defined(_WIN32) || defined(_WIN64)