deps: don't unity-build Abseil; fix vendored wiiuse include#905
Merged
Conversation
Abseil's .cc files have file-scope statics (kAsciiToInt, kDigits, ...) that collide when unity-batched; disable unity for the in-tree Abseil build. wiiuse: add the vendored include whenever the bundled copy is built (keyed on WIIUSE_DIR) rather than on the system-libraries flag, so the graceful fallback also works when a system wiiuse is requested but absent. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01S5akSKFxSnxVz3RtLyU9QN
jcelerier
added a commit
to ossia/score
that referenced
this pull request
Jun 22, 2026
Points at the libossia fixes branch (ossia/libossia#905) so score builds clean against current libossia master (unity Abseil + system wiiuse fallback). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01S5akSKFxSnxVz3RtLyU9QN
jcelerier
added a commit
to ossia/score
that referenced
this pull request
Jun 24, 2026
Points at the libossia fixes branch (ossia/libossia#905) so score builds clean against current libossia master (unity Abseil + system wiiuse fallback). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01S5akSKFxSnxVz3RtLyU9QN
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Two integration fixes surfaced when building score against current master with
-DCMAKE_UNITY_BUILD=1and withOSSIA_USE_SYSTEM_LIBRARIES=ON:.ccfiles define file-scope statics (kAsciiToInt,kDigits, ...) that collide when unity-batched (redefinition ... with a different type).deps/abseil.cmakenow setsCMAKE_UNITY_BUILD OFFfor the in-tree Abseil build, matching whatdeps/re2.cmakealready does for re2.wiiuse.cmakefall back to the vendored build when a system wiiuse is requested but missing, butossia_features.cmakestill gated the vendored include on the system-libraries flag and skipped it (fatal error: 'wiiuse.h' file not found). It now adds the include whenever the bundled copy is built (keyed onWIIUSE_DIR).Verified locally: unity SDK build of
ossiais clean, and anOSSIA_USE_SYSTEM_wiiuse=ONbuild (no system wiiuse) falls back to vendored and compiles.🤖 Generated with Claude Code