Skip to content

[tech] Fix mac build by pinning abseil version for protobuf #107

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
netniV merged 1 commit into from
Jan 22, 2026
Merged

[tech] Fix mac build by pinning abseil version for protobuf #107

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
11 changes: 4 additions & 7 deletions mods/src/titlemac.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
#pragma once

#ifdef _WIN32
#elif defined(__APPLE__)
#ifdef __APPLE__

#include "windowtitle.h"
#import <Cocoa/Cocoa.h>

inline std::wstring WindowTitle::Get()
std::wstring WindowTitle::Get()
{
@autoreleasepool {
NSWindow *window = [NSApp mainWindow];
Expand All @@ -22,7 +19,7 @@
}
}

inline bool WindowTitle::Set(const std::wstring& title)
bool WindowTitle::Set(const std::wstring& title)
{
@autoreleasepool {
NSWindow *window = [NSApp mainWindow];
Expand All @@ -34,6 +31,6 @@

return true;
}
}
}

#endif
3 changes: 2 additions & 1 deletion xmake-packages/packages/p/protobuf/xmake.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ add_configs("zlib", {description = "Enable zlib", default = false, type = "boole
add_deps("cmake")

on_load(function (package)
package:add("deps", "abseil")
-- pin abseil to the version in https://github.com/protocolbuffers/protobuf/blob/main/protobuf_deps.bzl when you update protobuf
package:add("deps", "abseil 20250512.1")

if package:is_plat("windows") then
package:add("links", "libprotoc", "libprotobuf", "utf8_range", "utf8_validity", "libutf8_range", "libutf8_validity")
Expand Down
Loading