chore(build): remove mem dependency, use bc for allocation behavior now

This commit is contained in:
phaneron 2024-09-04 09:15:08 -04:00
parent 7adbe074cb
commit 1a8bf67452
6 changed files with 3 additions and 17 deletions

3
.gitmodules vendored
View file

@ -1,9 +1,6 @@
[submodule "lib/system"] [submodule "lib/system"]
path = lib/system path = lib/system
url = https://github.com/thunderbrewhq/system.git url = https://github.com/thunderbrewhq/system.git
[submodule "lib/mem"]
path = lib/mem
url = https://github.com/thunderbrewhq/mem.git
[submodule "lib/bc"] [submodule "lib/bc"]
path = lib/bc path = lib/bc
url = https://github.com/thunderbrewhq/bc.git url = https://github.com/thunderbrewhq/bc.git

View file

@ -19,10 +19,7 @@ pub fn build(b: *std.Build) void {
system.add_defines(storm); system.add_defines(storm);
// Get dependencies // Get dependencies
const mem = b.dependency("mem", .{});
const bc = b.dependency("bc", .{}); const bc = b.dependency("bc", .{});
// Publicly link mem
storm.linkLibrary(mem.artifact("mem"));
// Link bc // Link bc
storm.linkLibrary(bc.artifact("bc")); storm.linkLibrary(bc.artifact("bc"));

View file

@ -9,11 +9,6 @@
}, },
.bc = .{ .bc = .{
.url = "https://github.com/thunderbrewhq/bc/archive/refs/heads/master.zip", .url = "https://github.com/thunderbrewhq/bc/archive/refs/heads/master.zip",
.hash = "1220ef571af35d366e093fb7ad65b0ac65dcde291d5bbbd1d2cf42b0b1d59612fa0a", .hash = "1220c4c7888fb860cbe0297b9b525dab4ac6ae7b8b9b6b984147124b884c71ff8bf0",
}, }, },
.mem = .{
.url = "https://github.com/thunderbrewhq/mem/archive/refs/heads/master.zip",
.hash = "12205739d6afa86c264dde5ff94fdf7f14df68122054ce899934faf972d0b11d7ac5",
},
},
} }

View file

@ -1,3 +1,2 @@
add_subdirectory(system) add_subdirectory(system)
add_subdirectory(mem)
add_subdirectory(bc) add_subdirectory(bc)

@ -1 +0,0 @@
Subproject commit 515378839ec59155ef2b8df141f588f3f12f89d2

View file

@ -52,10 +52,9 @@ target_include_directories(storm
target_link_libraries(storm target_link_libraries(storm
PUBLIC PUBLIC
mem bc
PRIVATE PRIVATE
system system
bc
) )
if(HAS_NO_INVALID_OFFSETOF) if(HAS_NO_INVALID_OFFSETOF)