Minor changes to get view compiling on mac again

palaeoware · Feb 7, 2020 · 1352620 · 1352620
1 parent df936d6
commit 1352620
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/SPIERSview/SPIERSview.pro b/SPIERSview/SPIERSview.pro
@@ -133,7 +133,7 @@ win32 {
 }
 
 # Unix/Linux common build here
-unix!macx {
+unix:!macx {
         #Libraries from VTK package (e.g. sudo apt-get install libvtk7-qt-dev).
 	INCLUDEPATH +=/usr/include/vtk-7.1/
 	LIBS += -L/usr/include/vtk-7.1/ \

diff --git a/SPIERSview/src/main.cpp b/SPIERSview/src/main.cpp
@@ -18,12 +18,6 @@
 #include "../SPIERScommon/src/netmodule.h"
 #include "../SPIERScommon/src/darkstyletheme.h"
 
-#ifndef __APPLE__
-
-#ifdef _WIN64
-#include <windows.h>
-#endif
-
 /**
  * @brief logMessageOutput
  * @param type
@@ -54,6 +48,12 @@ void logMessageOutput(QtMsgType type, const QMessageLogContext &context, const Q
         break;
     }
 
+#ifndef __APPLE__
+
+#ifdef _WIN64
+#include <windows.h>
+#endif
+
 #ifdef QT_DEBUG
     // Save to debug.log
     QFile outFile("debug.log");