Merged
Conversation
FtZPetruska
added a commit
to FtZPetruska/SDL_net
that referenced
this pull request
May 30, 2022
- Set a different output name for static libraries on MSVC and WATCOM (cf. libsdl-org/SDL_image#275 and libsdl-org/SDL#5727) - Fix `PKG_PREFIX` on Windows (cf. libsdl-org/SDL_image#274) Co-authored-by: Anonymous Maarten <madebr@users.noreply.github.com>
madebr
added a commit
to libsdl-org/SDL_net
that referenced
this pull request
Jun 14, 2022
#48 * Add CMake support. Implementation is based off SDL2_Image. * Add CMake tests to test-versioning.sh. * Add CMake workflow Changes link flags to fix mingw builds. `showinterfaces` is disabled on MSVC workflow as the minimum version of SDL is too old for current MSVCRT and gives linker errors even when linking `legacy_stdio_definitions.lib` * Apply suggestion from review Only set `Compatible Interface Properties` for shared libraries. Co-authored-by: Anonymous Maarten <madebr@users.noreply.github.com> * CMake: Define SDL_MAIN_HANDLED for showinterfaces. This removes the need for SDL2main as it is a console-only application. MSVC workflow now builds showinterfaces. * Apply suggestion from review. The `mingw32` library is no longer needed as `showinterfaces` is a console app. Co-authored-by: Anonymous Maarten <madebr@users.noreply.github.com> * CMake: Update MSVC compiler flags. Applied review suggestion to use `target_compile_options`. Replaced `/wd4996` as `_WINSOCK_DEPRECATED_NO_WARNINGS` is enough. Raise the warning level to `/W3` to be consistent with the solution in `VisualC/`. * Apply suggestions from code review. - Set a different output name for static libraries on MSVC and WATCOM (cf. libsdl-org/SDL_image#275 and libsdl-org/SDL#5727) - Fix `PKG_PREFIX` on Windows (cf. libsdl-org/SDL_image#274) Co-authored-by: Anonymous Maarten <madebr@users.noreply.github.com> * CMake: Fix missing parenthesis. * CMake: Remove dead code. SDL_net does not build any dependency, so we don't need to force position independent code. * CMake: Add config files for XCode Frameworks * CMake: Generate cmake config when using autotools. * CMake: Add config files for mingw devel archive. * CMake: Add config files for VC devel archive. * Regenerate autotools file with CMake support. * autogen.sh + cmake integration test * Don't force an installed SDL2_net::SDL2_net-static to link with a specific SDL2 sharedness library * Update PrivateSdlFunctions.cmake * Apply suggestion from review. Fix option de-duplication issues when linking with SDL2 framework. Co-authored-by: Anonymous Maarten <madebr@users.noreply.github.com> * CMake: Escape framework parent path. This is necessary if the framework has a space in its path. * Apply suggestion from review. Fix name mismatch between the bundled CMake config file for mingw and the generated config. Co-authored-by: Anonymous Maarten <madebr@users.noreply.github.com> * Apply suggestion from review. Fix regex match. Co-authored-by: Anonymous Maarten <madebr@users.noreply.github.com> * Apply suggestion from review. No longer set PKG_PREFIX on macOS. Co-authored-by: Anonymous Maarten <madebr@users.noreply.github.com> Co-authored-by: Anonymous Maarten <madebr@users.noreply.github.com> Co-authored-by: Anonymous Maarten <anonymous.maarten@gmail.com>
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.
SD2_image-static.This avoids a clash between the dll import library and the static library.
This avoids using a static SDL2 and shared SDL2_image together.
cmakesubfolder.This should fix CMake build on Windows installs package config in non-standard directory #274