[pull] master from OpenApoc:master #89
Open
Conversation
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
Refactoring vehiclemission and cityview
We were using gcc-13 but that seems to have been removed from the 22.04 image that "ubuntu-latest" actually gave us. May as well move to gcc-14 at the same time.
Move github builder to ubuntu 24.04 and gcc-14
Fix incorrect package name in readme, Tested on Ubuntu 24.04
Add partial clip refilling in battlescape
…ed-ufo-name Issue 1443: Hiding unresearched UFO names
Fix duplicate TU above agents in debug mode
…after-battle Live alien recovery after base defense battle
Add in-game mouse grab toggle
Fix cutoff text in text_funds label
Currency formatting optional
Allow word wrapping in item and ammo names
Fix TextButton on macOS
Update macOS build instructions
We only really need it in the toplevel file
Pulls in (at least) the new find_package(Boost) stuff
Bumps the minimum cmake version past 3.5 (which is now removed) while not changing the api
DEPENDS never did anything Run the format post-build - it's what was happening anyway, so don't change behavior, and running format with other targets likely doesn't make much sense
Just pulls in a change to the minimum version
This *appears* harmless to enable on every platform, as then the OPENGL_glx_LIBRARY is just empty?
It seems the mirror vcpkg uses is down? And we don't *need* it for builds anyway?
qt5-15 was removed from appveyor, and as we don't actually use any qt5-specific features we can just move to qt6.
Looks like the RUNTIME_OUTPUT_DIRECTORY property is the "correct" way of doing this now, and the EXECUTABLE_OUTPUT_PATH global doesn't work with qt?
We really should always have the pdb, even on release builds
Gives a chance of actually using them for debugging?
Does the "bare minimum" to pull up the minimum required cmake version Choosing 3.30, as that pulls in the CMP0167 boost changes at least. Also qt-5.15 has been removed from appveyor, so move to qt-6. This seemed to cause some differences to how the local built files pull in required plugins etc. so run windeployqt at build time on win32. Might also be required on macos, but no ability to test right now.
This always was an internal boost detail, and seems to be removed from boost-1.89
Remove Boost_system dependency
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
See Commits and Changes for more details.
Created by
pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )