From fe6d15076c6eb403c9583fab4b76d17a0cd641f5 Mon Sep 17 00:00:00 2001 From: failcake <4944278+edunad@users.noreply.github.com> Date: Sun, 29 Sep 2024 12:40:15 +0200 Subject: [PATCH 1/9] Fix build --- rawrbox.render/include/stb/stb_gif.hpp | 4 ++++ 1 file changed, 4 insertions(+) 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) From 468f87e994a380ba40d727b68767be6903fdb061 Mon Sep 17 00:00:00 2001 From: failcake <4944278+edunad@users.noreply.github.com> Date: Sun, 29 Sep 2024 12:45:13 +0200 Subject: [PATCH 2/9] Fix build --- rawrbox.scripting/include/rawrbox/scripting/utils/lua.hpp | 5 +++++ rawrbox.scripting/src/utils/lua.cpp | 6 +----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/rawrbox.scripting/include/rawrbox/scripting/utils/lua.hpp b/rawrbox.scripting/include/rawrbox/scripting/utils/lua.hpp index 0bd2407c..9bef6544 100644 --- a/rawrbox.scripting/include/rawrbox/scripting/utils/lua.hpp +++ b/rawrbox.scripting/include/rawrbox/scripting/utils/lua.hpp @@ -11,9 +11,14 @@ #include +#include + #include #include +LUAU_FASTFLAG(LuauSolverV2); +LUAU_DYNAMIC_FASTINTVARIABLE(LuauTypeSolverRelease, 900) + namespace rawrbox { class LuaUtils { public: diff --git a/rawrbox.scripting/src/utils/lua.cpp b/rawrbox.scripting/src/utils/lua.cpp index 9f039f3c..c2331526 100644 --- a/rawrbox.scripting/src/utils/lua.cpp +++ b/rawrbox.scripting/src/utils/lua.cpp @@ -2,13 +2,9 @@ #include #include -#include - -LUAU_FASTFLAG(LuauSolverV2); -LUAU_DYNAMIC_FASTINTVARIABLE(LuauTypeSolverRelease, 900) - #include + namespace rawrbox { void LuaUtils::compileAndLoadFile(lua_State* L, const std::string& chunkID, const std::filesystem::path& path) { From 54342320d9357eaefdeb620d83db4670c48e40ea Mon Sep 17 00:00:00 2001 From: failcake <4944278+edunad@users.noreply.github.com> Date: Sun, 29 Sep 2024 13:16:13 +0200 Subject: [PATCH 3/9] Fix build --- .../include/rawrbox/scripting/utils/lua.hpp | 9 +++++++-- rawrbox.ui/include/rawrbox/ui/static.hpp | 1 - 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/rawrbox.scripting/include/rawrbox/scripting/utils/lua.hpp b/rawrbox.scripting/include/rawrbox/scripting/utils/lua.hpp index 9bef6544..82f8a0fe 100644 --- a/rawrbox.scripting/include/rawrbox/scripting/utils/lua.hpp +++ b/rawrbox.scripting/include/rawrbox/scripting/utils/lua.hpp @@ -16,8 +16,13 @@ #include #include -LUAU_FASTFLAG(LuauSolverV2); -LUAU_DYNAMIC_FASTINTVARIABLE(LuauTypeSolverRelease, 900) +namespace DFInt { + int LuauTypeSolverRelease = 999; + bool LuauSolverV2 = true; +} // namespace DFInt + +// LUAU_FASTFLAG(LuauSolverV2); +// LUAU_DYNAMIC_FASTINTVARIABLE(LuauTypeSolverRelease, 900) namespace rawrbox { class LuaUtils { 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 From b5cbf3ad6c960619dce967c4adf298de8f2efbb7 Mon Sep 17 00:00:00 2001 From: failcake <4944278+edunad@users.noreply.github.com> Date: Sun, 29 Sep 2024 13:16:35 +0200 Subject: [PATCH 4/9] Cleanup --- rawrbox.scripting/include/rawrbox/scripting/utils/lua.hpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/rawrbox.scripting/include/rawrbox/scripting/utils/lua.hpp b/rawrbox.scripting/include/rawrbox/scripting/utils/lua.hpp index 82f8a0fe..f4995fb6 100644 --- a/rawrbox.scripting/include/rawrbox/scripting/utils/lua.hpp +++ b/rawrbox.scripting/include/rawrbox/scripting/utils/lua.hpp @@ -21,9 +21,6 @@ namespace DFInt { bool LuauSolverV2 = true; } // namespace DFInt -// LUAU_FASTFLAG(LuauSolverV2); -// LUAU_DYNAMIC_FASTINTVARIABLE(LuauTypeSolverRelease, 900) - namespace rawrbox { class LuaUtils { public: From 77629f682a6b02add3428a263771c48b81115783 Mon Sep 17 00:00:00 2001 From: failcake <4944278+edunad@users.noreply.github.com> Date: Sun, 29 Sep 2024 13:27:49 +0200 Subject: [PATCH 5/9] fix build --- rawrbox.scripting/include/rawrbox/scripting/utils/lua.hpp | 4 ++-- rawrbox.scripting/src/utils/lua.cpp | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/rawrbox.scripting/include/rawrbox/scripting/utils/lua.hpp b/rawrbox.scripting/include/rawrbox/scripting/utils/lua.hpp index f4995fb6..d9fd6a2d 100644 --- a/rawrbox.scripting/include/rawrbox/scripting/utils/lua.hpp +++ b/rawrbox.scripting/include/rawrbox/scripting/utils/lua.hpp @@ -17,8 +17,8 @@ #include namespace DFInt { - int LuauTypeSolverRelease = 999; - bool LuauSolverV2 = true; + extern int LuauTypeSolverRelease; + extern int LuauSolverV2; } // namespace DFInt namespace rawrbox { diff --git a/rawrbox.scripting/src/utils/lua.cpp b/rawrbox.scripting/src/utils/lua.cpp index c2331526..54b8096c 100644 --- a/rawrbox.scripting/src/utils/lua.cpp +++ b/rawrbox.scripting/src/utils/lua.cpp @@ -4,6 +4,10 @@ #include +namespace DFInt { + int LuauTypeSolverRelease = 999; + int LuauSolverV2 = 1; +} // namespace DFInt namespace rawrbox { From eb3cdda07dda3a311dce024f0ec2e1f3038a3825 Mon Sep 17 00:00:00 2001 From: failcake <4944278+edunad@users.noreply.github.com> Date: Sun, 29 Sep 2024 13:49:27 +0200 Subject: [PATCH 6/9] fix build --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d7601cbb..33e7aa5e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -212,7 +212,7 @@ endif() if(RAWRBOX_BUILD_RAWRBOX_RENDER) if(NOT WIN32 AND RAWRBOX_USE_WAYLAND) - CPMAddPackage("https://gitlab.freedesktop.org/wayland/weston@14.0.0") + CPMAddPackage("https://gitlab.freedesktop.org/wayland/weston@13.0.3") endif() endif() @@ -230,7 +230,7 @@ if(RAWRBOX_BUILD_RAWRBOX_NETWORK) USE_CACHE OFF GIT_TAG - 2.2.2 + 2.2.1 OPTIONS "ZLIB_COMPAT ON" "ZLIB_BUILD_EXAMPLES OFF" From d59050058973843793c9b871e6d6901f3d2734df Mon Sep 17 00:00:00 2001 From: failcake <4944278+edunad@users.noreply.github.com> Date: Sun, 29 Sep 2024 14:25:46 +0200 Subject: [PATCH 7/9] Fix build --- rawrbox.scripting/include/rawrbox/scripting/utils/lua.hpp | 3 ++- rawrbox.scripting/src/utils/lua.cpp | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/rawrbox.scripting/include/rawrbox/scripting/utils/lua.hpp b/rawrbox.scripting/include/rawrbox/scripting/utils/lua.hpp index d9fd6a2d..e2bb96c5 100644 --- a/rawrbox.scripting/include/rawrbox/scripting/utils/lua.hpp +++ b/rawrbox.scripting/include/rawrbox/scripting/utils/lua.hpp @@ -16,11 +16,12 @@ #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 54b8096c..3c537a1e 100644 --- a/rawrbox.scripting/src/utils/lua.cpp +++ b/rawrbox.scripting/src/utils/lua.cpp @@ -4,11 +4,11 @@ #include -namespace DFInt { +/*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) { From 33cab855fd8140fdf300896b3075be6c992ea0bf Mon Sep 17 00:00:00 2001 From: failcake <4944278+edunad@users.noreply.github.com> Date: Sun, 29 Sep 2024 14:27:10 +0200 Subject: [PATCH 8/9] fix build --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) 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: From 63caea0143c711b026600fe57a9667e1a72e298f Mon Sep 17 00:00:00 2001 From: failcake <4944278+edunad@users.noreply.github.com> Date: Sun, 29 Sep 2024 14:55:24 +0200 Subject: [PATCH 9/9] Fix build --- CMakeLists.txt | 4 ++-- rawrbox.scripting/include/rawrbox/scripting/utils/lua.hpp | 1 + rawrbox.scripting/src/utils/lua.cpp | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 33e7aa5e..d7601cbb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -212,7 +212,7 @@ endif() if(RAWRBOX_BUILD_RAWRBOX_RENDER) if(NOT WIN32 AND RAWRBOX_USE_WAYLAND) - CPMAddPackage("https://gitlab.freedesktop.org/wayland/weston@13.0.3") + CPMAddPackage("https://gitlab.freedesktop.org/wayland/weston@14.0.0") endif() endif() @@ -230,7 +230,7 @@ if(RAWRBOX_BUILD_RAWRBOX_NETWORK) USE_CACHE OFF GIT_TAG - 2.2.1 + 2.2.2 OPTIONS "ZLIB_COMPAT ON" "ZLIB_BUILD_EXAMPLES OFF" diff --git a/rawrbox.scripting/include/rawrbox/scripting/utils/lua.hpp b/rawrbox.scripting/include/rawrbox/scripting/utils/lua.hpp index e2bb96c5..6a6d9a67 100644 --- a/rawrbox.scripting/include/rawrbox/scripting/utils/lua.hpp +++ b/rawrbox.scripting/include/rawrbox/scripting/utils/lua.hpp @@ -22,6 +22,7 @@ namespace DFInt { 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 3c537a1e..15d49d88 100644 --- a/rawrbox.scripting/src/utils/lua.cpp +++ b/rawrbox.scripting/src/utils/lua.cpp @@ -4,7 +4,8 @@ #include -/*namespace DFInt { +/* +namespace DFInt { int LuauTypeSolverRelease = 999; int LuauSolverV2 = 1; } // namespace DFInt