luciusDXL / TheForceEngine

Modern "Jedi Engine" replacement supporting Dark Forces, mods, and in the future Outlaws.
https://TheForceEngine.github.io
GNU General Public License v2.0
976 stars 71 forks source link

Fix Linux compilation when ENABLE_FORCE_SCRIPT is turned ON. #356

Closed luciusDXL closed 12 months ago

luciusDXL commented 1 year ago

With default options, the project should build on Linux. However, include directories do not seem to be working as expected when the ENABLE_FORCE_SCRIPT option is enabled, which should be fixed.

I plan on looking at this when I get access to Linux again, but if someone else wants to take a look that would be great. :)

mlauss2 commented 12 months ago

All that's missing is this:

diff --git a/TheForceEngine/TFE_ForceScript/forceScript.cpp b/TheForceEngine/TFE_ForceScript/forceScript.cpp
index f335a34c..aa4cf5a4 100644
--- a/TheForceEngine/TFE_ForceScript/forceScript.cpp
+++ b/TheForceEngine/TFE_ForceScript/forceScript.cpp
@@ -1,6 +1,6 @@
 #include "forceScript.h"
 #include <TFE_System/system.h>
-#include <TFE_FrontEndUI/frontEndUI.h>
+#include <TFE_FrontEndUI/frontEndUi.h>
 #include <stdint.h>
 #include <cstring>
 #include <algorithm>
diff --git a/TheForceEngine/TFE_ForceScript/script_system.cpp b/TheForceEngine/TFE_ForceScript/script_system.cpp
index 834dcd8a..bd4d1877 100644
--- a/TheForceEngine/TFE_ForceScript/script_system.cpp
+++ b/TheForceEngine/TFE_ForceScript/script_system.cpp
@@ -1,6 +1,6 @@
 #include "forceScript.h"
 #include <TFE_System/system.h>
-#include <TFE_FrontEndUI/frontEndUI.h>
+#include <TFE_FrontEndUI/frontEndUi.h>
 #include <stdint.h>
 #include <cstring>
 #include <algorithm>
luciusDXL commented 12 months ago

Wow, that was simple. Thanks. 👍 I pushed the fix.