diff --git a/ext/ghoul b/ext/ghoul index 34a1812afc..5263d3ea02 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit 34a1812afc4fe8f71df7e1f41c427abd10d14586 +Subproject commit 5263d3ea026dadb1a7936ccc95cbea9531268c20 diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp index 29378a4061..c2720cb26d 100644 --- a/src/engine/openspaceengine.cpp +++ b/src/engine/openspaceengine.cpp @@ -45,6 +45,7 @@ #include #include #include +#include #include #include @@ -70,12 +71,6 @@ #endif #endif -// The syncbuffer includes SGCT which (on Linux) includes Xlib. Xlib #defines 'None', -// which confuses the systemcapabilities, so it has to be included last unfortunately -// ---abock -#include - - using namespace openspace::scripting; using namespace ghoul::filesystem; using namespace ghoul::logging;