aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Rahm <joshuarahm@gmail.com>2025-12-23 13:16:01 -0700
committerJosh Rahm <joshuarahm@gmail.com>2025-12-23 13:16:01 -0700
commit06bb412005cf29ca44721c9c9dfd42c1ceba04f5 (patch)
tree359048a14d8477bf715f396b0b4e431e39891067
parent46efbf05fcade8199035f956e20a63ca91fc88fd (diff)
downloadSonsOfSol-master.tar.gz
SonsOfSol-master.tar.bz2
SonsOfSol-master.zip
Fix build errors.HEADmaster
-rwxr-xr-xgenmake.sh2
-rw-r--r--slox/slox/loader/SloxObjectLoader.hpp2
-rw-r--r--sons_of_sol/private_db/PlayerShip.cpp3
3 files changed, 4 insertions, 3 deletions
diff --git a/genmake.sh b/genmake.sh
index a6e8240..f29a4f2 100755
--- a/genmake.sh
+++ b/genmake.sh
@@ -58,7 +58,7 @@ exec 3<> Makefile
echo 'CPPC?=g++'>&3
echo 'AR?=ar'>&3
echo 'OPTFLAGS?=-g3 -ggdb'>&3
-echo "CFLAGS=$CFLAGS -Wall -Wextra -I. "'$(OPTFLAGS)'" -D DEBUG_LEVEL_TRACE -Islox -Iglox">&3
+echo "CFLAGS=$CFLAGS -Wall -Wextra -I. "'$(OPTFLAGS)'" -D DEBUG_LEVEL_TRACE -Islox -Iglox -Iglox/compat">&3
echo "LDFLAGS=$LDFLAGS -Lslox -Lglox -lslox -lglox -lGL -lGLU -lSDL -lm -ljpeg -lSDL_image -lGLEW">&3
echo 'OBJECTS='${obs[@]}>&3
echo 'BINARY='$BINARY_NAME>&3
diff --git a/slox/slox/loader/SloxObjectLoader.hpp b/slox/slox/loader/SloxObjectLoader.hpp
index 224943b..d17c331 100644
--- a/slox/slox/loader/SloxObjectLoader.hpp
+++ b/slox/slox/loader/SloxObjectLoader.hpp
@@ -7,8 +7,8 @@
* SloxObjectLoader.hpp: <description>
*/
-#include "slox/SloxTextureFactory.hpp"
#include "slox/loader/SloxModelObject.hpp"
+#include "slox/SloxTextureFactory.hpp"
#include <cerrno>
#include <fstream>
diff --git a/sons_of_sol/private_db/PlayerShip.cpp b/sons_of_sol/private_db/PlayerShip.cpp
index 6e2fb23..4161f79 100644
--- a/sons_of_sol/private_db/PlayerShip.cpp
+++ b/sons_of_sol/private_db/PlayerShip.cpp
@@ -1,7 +1,8 @@
+#include "glox/GloxCommon.hpp"
+
#include "sons_of_sol/PlayerShip.hpp"
#include "glox/GloxColor.hpp"
-#include "glox/GloxCommon.hpp"
using namespace glox;
using namespace std;