Merge pull request #203 from edunad/bugfixes/build

Fix build
edunad · Sep 29, 2024 · 6585c3b · 6585c3b
2 parents ba416ea + 63caea0
commit 6585c3b
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -29,6 +29,7 @@ jobs:
         run: |
           sudo apt update
           sudo apt install -y git wget cmake libegl1-mesa-dev libwayland-dev libxkbcommon-dev wayland-protocols libvulkan-dev libssl-dev libvpx-dev gcc-14 g++-14 libgl1-mesa-dev libglew-dev ninja-build python3-pip libx11-dev libx11-xcb-dev libfontenc-dev libice-dev libsm-dev libxau-dev libxaw7-dev libxcomposite-dev libxcursor-dev libxdamage-dev libxdmcp-dev libxext-dev libxfixes-dev libxft-dev libxi-dev libxinerama-dev libxkbfile-dev libxmu-dev libxmuu-dev libxpm-dev libxrandr-dev libxrender-dev libxres-dev libxss-dev libxt-dev libxtst-dev libxv-dev libxvmc-dev libxxf86vm-dev xtrans-dev libxcb-render0-dev libxcb-render-util0-dev libxcb-xkb-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-randr0-dev libxcb-shape0-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-xinerama0-dev xkb-data libxcb-dri3-dev uuid-dev libxcb-util-dev
+
       - name: Cache c++
         uses: hendrikmuhs/ccache-action@ed74d11c0b343532753ecead8a951bb09bb34bc9
         with:

diff --git a/rawrbox.render/include/stb/stb_gif.hpp b/rawrbox.render/include/stb/stb_gif.hpp
@@ -13,6 +13,10 @@
 #define STBI_ONLY_GIF
 #define STBI_ONLY_TGA
 
+#define STBI_FREE(ptr)           std::free(ptr)
+#define STBI_MALLOC(size)        std::malloc(size)
+#define STBI_REALLOC(ptr, nsize) std::realloc(ptr, nsize)
+
 #include <stb/stb_image.hpp>
 #include <stb/stb_image_write.hpp>
 #pragma warning(pop)

diff --git a/rawrbox.scripting/include/rawrbox/scripting/utils/lua.hpp b/rawrbox.scripting/include/rawrbox/scripting/utils/lua.hpp
@@ -11,9 +11,18 @@
 
 #include <glaze/glaze.hpp>
 
+#include <Luau/Compiler.h>
+
 #include <filesystem>
 #include <string>
 
+/*
+namespace DFInt {
+	extern int LuauTypeSolverRelease;
+	extern int LuauSolverV2;
+} // namespace DFInt
+*/
+
 namespace rawrbox {
 	class LuaUtils {
 	public:

diff --git a/rawrbox.scripting/src/utils/lua.cpp b/rawrbox.scripting/src/utils/lua.cpp
@@ -2,13 +2,14 @@
 #include <rawrbox/utils/file.hpp>
 #include <rawrbox/utils/string.hpp>
 
-#include <Luau/Compiler.h>
-
-LUAU_FASTFLAG(LuauSolverV2);
-LUAU_DYNAMIC_FASTINTVARIABLE(LuauTypeSolverRelease, 900)
-
 #include <fmt/format.h>
 
+/*
+namespace DFInt {
+	int LuauTypeSolverRelease = 999;
+	int LuauSolverV2 = 1;
+} // namespace DFInt
+*/
 namespace rawrbox {
 
 	void LuaUtils::compileAndLoadFile(lua_State* L, const std::string& chunkID, const std::filesystem::path& path) {

diff --git a/rawrbox.ui/include/rawrbox/ui/static.hpp b/rawrbox.ui/include/rawrbox/ui/static.hpp
@@ -4,7 +4,6 @@
 #include <string>
 #include <vector>
 
-
 namespace rawrbox {
 	extern std::vector<std::pair<std::string, uint32_t>> UI_RESOURCES;
 } // namespace rawrbox