This should fix issues on Big Sur, and puts us on par with Windows
Details
- Reviewers
- None
Compile, run atlas.
Diff Detail
- Repository
- rP 0 A.D. Public Repository
- Branch
- temp
- Lint
Lint OK - Unit
No Unit Test Coverage - Build Status
Buildable 14986 Build 32369: Vulcan Build Jenkins Build 32368: Vulcan Build (macOS) Jenkins Build 32367: Vulcan Build (Windows) Jenkins Build 32366: arc lint + arc unit
Event Timeline
Build is green
builderr-debug-macos.txt ld: warning: text-based stub file /System/Library/Frameworks//CoreAudio.framework/CoreAudio.tbd and library file /System/Library/Frameworks//CoreAudio.framework/CoreAudio are out of sync. Falling back to library file for linking. ld: warning: text-based stub file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox.tbd and library file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox are out of sync. Falling back to library file for linking. ld: warning: text-based stub file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback.tbd and library file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback are out of sync. Falling back to library file for linking. ld: warning: text-based stub file /System/Library/Frameworks//CoreVideo.framework/CoreVideo.tbd and library file /System/Library/Frameworks//CoreVideo.framework/CoreVideo are out of sync. Falling back to library file for linking. ld: warning: text-based stu
See https://jenkins.wildfiregames.com/job/macos-differential/2771/display/redirect for more details.
This leads to the OpenGL window occupying only ¼ of the screen locally. I think I'll have to change something else...
This fixes the scaling, per https://wildfiregames.com/forum/topic/28249-trunk23678-atlas-editor-the-map-simulation-displayed-at-14-bottom-left-corner-of-its-canvas-osx/?tab=comments#comment-398428 .
I think the bundle will use low-DPI, since we're not HighDPI capable, meaning the controls will look ugly.
On the contrary, the standalone executable will use HighDPI, which means the game will lag horribly because the resolution is 2x as high as it ought to be.
Ideally we'd go High-DPI capable but render to a sub-sampled framebuffer in all cases so the issue is circumvented.
Build has FAILED
builderr-debug-macos.txt /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libsimulation2_dbg.a(precompiled.o) has no symbols /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libgraphics_dbg.a(precompiled.o) has no symbols /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libatlas_dbg.a(precompiled.o) has no symbols ld: warning: text-based stub file /System/Library/Frameworks//CoreAudio.framework/CoreAudio.tbd and library file /System/Library/Frameworks//CoreAudio.framework/CoreAudio are out of sync. Falling back to library file for linking. ld: warning: text-based stub file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox.tbd and library file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox are out of sync. Falling back to library
Link to build: https://jenkins.wildfiregames.com/job/macos-differential/2827/display/redirect
See console output for more information: https://jenkins.wildfiregames.com/job/macos-differential/2827/display/redirectconsole
Not planning to merge this for A24 because the bundles appear to work correctly regardless. SVN has other problems.