From 1eea94e82e2ee65a25c3393ff62546f96bccb8bc Mon Sep 17 00:00:00 2001
From: Boleslaw Ciesielski <combolek@users.noreply.github.com>
Date: Sun, 3 Nov 2019 17:43:34 -0800
Subject: [PATCH] Visual Studio 2017 porting changes

---
 gui/main.cpp    | 9 +++++++++
 plater/util.cpp | 7 +++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/gui/main.cpp b/gui/main.cpp
index 09f0475..4f606bb 100644
--- 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
index 1f341d5..5800c72 100644
--- 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)