Skip to content

Fix shared library name conflict #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
afq984 merged 1 commit into from
Mar 28, 2026
Merged

Fix shared library name conflict #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ bazel_dep(name = "gamedata", version = "0")

git_override(
module_name = "toolchains_chromium",
remote = "https://github.com/afq984/toolchains_chromium.git",
commit = "1a93deae0f654933afe585749d35b7ef82d89bd8",
remote = "https://github.com/google/toolchains_chromium.git",
commit = "1cc2c49e1e120e42349ad643dc3e09cda2f2fbcb",
)

git_override(
Expand Down
103 changes: 28 additions & 75 deletions MODULE.bazel.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion patcher/extract/extract.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ int main(int argc, char **argv) {
fprintf(stderr, "Failed to create runfiles: %s\n", error.c_str());
return 1;
}
auto ooz_path = runfiles->Rlocation("ooz/liblibooz.so");
auto ooz_path = runfiles->Rlocation("ooz/libooz.so");
Bun *bun = BunNew(ooz_path.c_str(), "Ooz_Decompress");
if (!bun) {
fprintf(stderr, "Failed to load liblibooz.so\n");
Expand Down
2 changes: 1 addition & 1 deletion third_party/ooz.BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ cc_library(

cc_shared_library(
name = "libooz_so",
shared_lib_name = "liblibooz.so",
shared_lib_name = "libooz.so",
visibility = ["//visibility:public"],
deps = [":libooz"],
)
Expand Down
Loading