diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2d421a90..ca1582c8 100644 --- 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 index 78a0f283..42fde2d1 100644 --- 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 #include #pragma warning(pop) diff --git a/rawrbox.scripting/include/rawrbox/scripting/utils/lua.hpp b/rawrbox.scripting/include/rawrbox/scripting/utils/lua.hpp index 0bd2407c..6a6d9a67 100644 --- a/rawrbox.scripting/include/rawrbox/scripting/utils/lua.hpp +++ b/rawrbox.scripting/include/rawrbox/scripting/utils/lua.hpp @@ -11,9 +11,18 @@ #include +#include + #include #include +/* +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 index 9f039f3c..15d49d88 100644 --- a/rawrbox.scripting/src/utils/lua.cpp +++ b/rawrbox.scripting/src/utils/lua.cpp @@ -2,13 +2,14 @@ #include #include -#include - -LUAU_FASTFLAG(LuauSolverV2); -LUAU_DYNAMIC_FASTINTVARIABLE(LuauTypeSolverRelease, 900) - #include +/* +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 index ef147a9b..1fcaf20c 100644 --- a/rawrbox.ui/include/rawrbox/ui/static.hpp +++ b/rawrbox.ui/include/rawrbox/ui/static.hpp @@ -4,7 +4,6 @@ #include #include - namespace rawrbox { extern std::vector> UI_RESOURCES; } // namespace rawrbox