diff --git a/mods/src/titlemac.mm b/mods/src/titlemac.mm index d871141..51f04d6 100644 --- a/mods/src/titlemac.mm +++ b/mods/src/titlemac.mm @@ -1,12 +1,9 @@ -#pragma once - -#ifdef _WIN32 -#elif defined(__APPLE__) +#ifdef __APPLE__ #include "windowtitle.h" #import -inline std::wstring WindowTitle::Get() +std::wstring WindowTitle::Get() { @autoreleasepool { NSWindow *window = [NSApp mainWindow]; @@ -22,7 +19,7 @@ } } -inline bool WindowTitle::Set(const std::wstring& title) +bool WindowTitle::Set(const std::wstring& title) { @autoreleasepool { NSWindow *window = [NSApp mainWindow]; @@ -34,6 +31,6 @@ return true; } -} +} #endif diff --git a/xmake-packages/packages/p/protobuf/xmake.lua b/xmake-packages/packages/p/protobuf/xmake.lua index 7d9dac6..6e0b0b4 100644 --- a/xmake-packages/packages/p/protobuf/xmake.lua +++ b/xmake-packages/packages/p/protobuf/xmake.lua @@ -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")