openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Fix scons and Linux builds

Browse Source
This commit is contained in:
Celtic Minstrel
2020-01-26 13:33:02 -05:00
parent b0fddcd8a6
commit 2d1ee24473
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/tools/SConscript
View File

@@ -16,8 +16,7 @@ tools = Split("""
../fileio/special_parse.cpp ../fileio/special_parse.cpp
../fileio/tarball.cpp ../fileio/tarball.cpp
../fileio/gzstream/gzstream.cpp ../fileio/gzstream/gzstream.cpp
../fileio/resmgr/restypes.cpp """) + Glob("../fileio/resmgr/*.cpp") + Glob("../gfx/*.cpp") + Glob("../scenario/*.cpp")
""") + Glob("../gfx/*.cpp") + Glob("../scenario/*.cpp")
if str(platform) == "darwin": if str(platform) == "darwin":
tools.extend(Glob("*.mac.*")) tools.extend(Glob("*.mac.*"))

1
src/tools/cursors.linux.cpp
View File

@@ -2,6 +2,7 @@
#include "cursors.hpp" #include "cursors.hpp"
// #include "restypes.hpp" // Include before X11 to avoid macro conflicts in SFML // #include "restypes.hpp" // Include before X11 to avoid macro conflicts in SFML
#include "res_cursor.hpp" #include "res_cursor.hpp"
#include <SFML/Graphics.hpp>
namespace x11 { namespace x11 {