More external_deps build fixes #1642
Merged
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
There was a stray pkgconfig in the list of required packages for one of the Windows platforms. pkgconfig only makes sense as a host-mode dependency. Also it crashes the compiler.
The build script for mingw sdl2 uses prebuilt binaries, but calls a makefile which only substitutes some hard-coded paths into some build config helpers and copies the files. Just copy the files ourselves and don't munge the configs: the unmunged cmake uses a relative path which is actually what we want. In newer SDL versions the makefile munges the cmake configs (in addition to the shell-based one) which breaks us.
In the cmake config files in lib/cmake, substitute .dll.a -> .lib when targeting MSVC.
We don't want the DLLs we build to depend on the MinGW standard library DLLs.
Building glew for windows-i686-mingw resulted in a link error about undefined strlen. This happend because setting CFLAGS.EXTRA on the Make command line clobbers some required flags. Pass the flags in a different way so they append rather than clobbering.
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.
The 6 issues fixed here are present both in master, and with #1433.