Update SDL and fix windows builds #172
Merged
Conversation
This file contains 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
This change is to be commited alongside the changes in splashkit-external
Also update the linker flags to link with the Msys provided libs
|
We need to keep the lib/win64 libraries as these are used in the deploy to avoid people having to install the different package separately (though maybe we should change this) Have a look at the cmake file in the scripts/cmake/libsplashkit subfolder and copy the idea of using the pacman installed sdl libraries. |
macite
requested changes
Apr 9, 2024
This reverts commit 204750d.
hugglesfox
force-pushed
the
update_sdl
branch
3 times, most recently
from
eb24cd6 to
aa87f1f
Compare
When changing over to using pkg-config for configuring the windows builds, it added the -mwindows link flag. This causes the compiler to load the problem via WinMain rather then main. However SDL2 is able to provide a WinMain which does windows specific setup then calls main as expected on unix system. In order to use it we need to include the SDL header where the test main functions are defined.
|
I believe this is now done. Check the commit description in regards to why the SDL headers have been added to the test main files. In regrads to the CI failures, the macOS build depends on the changes in splashkit-external before it'll pass |
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.
Description
This is the sibling PR to splashkit-external#7. Additionally this PR removes linking to sqlite for windows, removes the prebuilt dependencies for windows (talked to Andrew, these are redundant as we can use the system libraries from Msys2) and updates the cmake minimum version (removes a deprecation warning).
Untested for MacOS
Type of change
expected)
How Has This Been Tested?
Successfully builds tests on Linux and Windows
Testing Checklist
Checklist