Skip to content

Commit f1e40f2

Browse files
authored
Merge pull request #9 from combolek/master
Visual Studio 2017 porting changes
2 parents 8c690c7 + 1eea94e commit f1e40f2

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

Diff for: gui/main.cpp

+9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
#include <QApplication>
22
#include <QGLFormat>
3+
4+
#if defined(QT_STATIC)
5+
#include <QtPlugin>
6+
#if defined(_WIN32)
7+
Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin);
8+
Q_IMPORT_PLUGIN(QWindowsVistaStylePlugin);
9+
#endif
10+
#endif
11+
312
#include "mainwindow.h"
413

514
int main(int argc, char *argv[])

Diff for: plater/util.cpp

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1-
#if defined(_WIN32) || defined(_WIN64)
1+
#if defined(_WIN32)
22
#include <direct.h>
3+
#else
4+
#include <unistd.h>
35
#endif
6+
#include <cctype>
47
#include <iostream>
58
#include <sstream>
69
#include <algorithm>
7-
#include <unistd.h>
10+
#include <functional>
811
#include "util.h"
912

1013
#if defined(_WIN32) || defined(_WIN64)

0 commit comments

Comments
 (0)