mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-14 16:01:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix #define None include error on X11 systems

Browse Source
This commit is contained in:
Alexander Bock
2016-01-18 18:05:57 +01:00
parent aee6146d3f
commit 85d564767b
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/engine/openspaceengine.cpp
View File

@@ -45,6 +45,7 @@
#include <openspace/util/factorymanager.h>
#include <openspace/util/time.h>
#include <openspace/util/spicemanager.h>
#include <openspace/util/syncbuffer.h>
#include <ghoul/ghoul.h>
#include <ghoul/cmdparser/commandlineparser.h>
@@ -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 <openspace/util/syncbuffer.h>
using namespace openspace::scripting;
using namespace ghoul::filesystem;
using namespace ghoul::logging;