From 8e26690926761bc55dba43ce865bb1c2c4b84076 Mon Sep 17 00:00:00 2001 From: superp00t Date: Fri, 4 Aug 2023 19:57:51 -0400 Subject: [PATCH] chore(build): replace squall dependency with mem --- .gitmodules | 6 +++--- bc/CMakeLists.txt | 2 +- bc/Memory.cpp | 2 +- lib/mem | 1 + lib/squall | 1 - 5 files changed, 6 insertions(+), 6 deletions(-) create mode 160000 lib/mem delete mode 160000 lib/squall diff --git a/.gitmodules b/.gitmodules index a331068..3f7c0f8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ -[submodule "lib/squall"] - path = lib/squall - url = https://github.com/whoahq/squall [submodule "lib/system"] path = lib/system url = https://github.com/whoahq/system +[submodule "lib/mem"] + path = lib/mem + url = https://github.com/thunderbrewhq/mem.git diff --git a/bc/CMakeLists.txt b/bc/CMakeLists.txt index 3aea658..b518004 100644 --- a/bc/CMakeLists.txt +++ b/bc/CMakeLists.txt @@ -16,5 +16,5 @@ target_include_directories(bc target_link_libraries(bc PUBLIC - storm + mem ) diff --git a/bc/Memory.cpp b/bc/Memory.cpp index 53acd94..b8d1152 100644 --- a/bc/Memory.cpp +++ b/bc/Memory.cpp @@ -1,5 +1,5 @@ #include "bc/Memory.hpp" -#include +#include void* Blizzard::Memory::Allocate(uint32_t bytes) { return SMemAlloc(bytes, __FILE__, __LINE__, 0x0); diff --git a/lib/mem b/lib/mem new file mode 160000 index 0000000..8a8fa79 --- /dev/null +++ b/lib/mem @@ -0,0 +1 @@ +Subproject commit 8a8fa7918cebc8fdf23061d4501e49079af9a312 diff --git a/lib/squall b/lib/squall deleted file mode 160000 index 3d14119..0000000 --- a/lib/squall +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3d141195362dc7557d09deab5b25c3647ee4764e