-
Notifications
You must be signed in to change notification settings - Fork 180
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
14 changed files
with
167 additions
and
210 deletions.
There are no files selected for viewing
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 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 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,20 @@ | ||
| Building SDL2_image | ||
| Building SDL3_image | ||
| ------------------- | ||
|
|
||
| The easiest way to use SDL2_image with Emscripten is to use Emscripten ports (https://kripken.github.io/emscripten-site/docs/compiling/Building-Projects.html#emscripten-ports) (-s USE_SDL_IMAGE=2). | ||
| The easiest way to use SDL3_image with Emscripten is to use Emscripten ports (https://kripken.github.io/emscripten-site/docs/compiling/Building-Projects.html#emscripten-ports) (-s USE_SDL_IMAGE=2). | ||
|
|
||
| If you want to build it yourself instead you can use these instructions: | ||
|
|
||
| Step 0 - get emscripten | ||
|
|
||
| Step 1 - get sdl2-emscripten | ||
| * clone https://github.com/emscripten-ports/SDL2.git | ||
| * follow the build instructions in SDL2/docs/README-emscripten.md (make sure to pass a --prefix to configure) | ||
| Step 1 - get sdl3-emscripten | ||
| * clone https://github.com/emscripten-ports/SDL3.git | ||
| * follow the build instructions in SDL3/docs/README-emscripten.md (make sure to pass a --prefix to configure) | ||
| * make install | ||
|
|
||
| Step 2 - get sdl_image | ||
| * emconfigure ./configure --disable-sdltest --with-sdl-prefix=/path/to/sdl --prefix=/path/to/install | ||
| * (where /path/to/sdl is the path you passed as --prefix to SDL2 configure) | ||
| * (where /path/to/sdl is the path you passed as --prefix to SDL3 configure) | ||
| * emmake make | ||
| * make install | ||
|
|
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 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 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,90 +1,90 @@ | ||
| # sdl2_image cmake project-config input for CMakeLists.txt script | ||
| # sdl3_image cmake project-config input for CMakeLists.txt script | ||
|
|
||
| include(FeatureSummary) | ||
| set_package_properties(SDL2_image PROPERTIES | ||
| set_package_properties(SDL3_image PROPERTIES | ||
| URL "https://www.libsdl.org/projects/SDL_image/" | ||
| DESCRIPTION "SDL_image is an image file loading library" | ||
| ) | ||
|
|
||
| set(SDL2_image_FOUND ON) | ||
|
|
||
| set(SDL2IMAGE_AVIF @SDL2IMAGE_AVIF@) | ||
| set(SDL2IMAGE_BMP @SDL2IMAGE_BMP@) | ||
| set(SDL2IMAGE_GIF @SDL2IMAGE_GIF@) | ||
| set(SDL2IMAGE_JPG @SDL2IMAGE_JPG@) | ||
| set(SDL2IMAGE_JXL @SDL2IMAGE_JXL@) | ||
| set(SDL2IMAGE_LBM @SDL2IMAGE_LBM@) | ||
| set(SDL2IMAGE_PCX @SDL2IMAGE_PCX@) | ||
| set(SDL2IMAGE_PNG @SDL2IMAGE_PNG@) | ||
| set(SDL2IMAGE_PNM @SDL2IMAGE_PNM@) | ||
| set(SDL2IMAGE_QOI @SDL2IMAGE_QOI@) | ||
| set(SDL2IMAGE_SVG @SDL2IMAGE_SVG@) | ||
| set(SDL2IMAGE_TGA @SDL2IMAGE_TGA@) | ||
| set(SDL2IMAGE_TIF @SDL2IMAGE_TIF@) | ||
| set(SDL2IMAGE_XCF @SDL2IMAGE_XCF@) | ||
| set(SDL2IMAGE_XPM @SDL2IMAGE_XPM@) | ||
| set(SDL2IMAGE_XV @SDL2IMAGE_XV@) | ||
| set(SDL2IMAGE_WEBP @SDL2IMAGE_WEBP@) | ||
|
|
||
| set(SDL2IMAGE_JPG_SAVE @SDL2IMAGE_JPG_SAVE@) | ||
| set(SDL2IMAGE_PNG_SAVE @SDL2IMAGE_PNG_SAVE@) | ||
|
|
||
| set(SDL2IMAGE_VENDORED @SDL2IMAGE_VENDORED@) | ||
|
|
||
| set(SDL2IMAGE_BACKEND_IMAGEIO @SDL2IMAGE_BACKEND_IMAGEIO@) | ||
| set(SDL2IMAGE_BACKEND_STB @SDL2IMAGE_BACKEND_STB@) | ||
| set(SDL2IMAGE_BACKEND_WIC @SDL2IMAGE_BACKEND_WIC@) | ||
|
|
||
| set(SDL2IMAGE_SDL2_REQUIRED_VERSION @SDL_REQUIRED_VERSION@) | ||
|
|
||
| if(NOT SDL2IMAGE_VENDORED) | ||
| set(SDL3_image_FOUND ON) | ||
|
|
||
| set(SDL3IMAGE_AVIF @SDL3IMAGE_AVIF@) | ||
| set(SDL3IMAGE_BMP @SDL3IMAGE_BMP@) | ||
| set(SDL3IMAGE_GIF @SDL3IMAGE_GIF@) | ||
| set(SDL3IMAGE_JPG @SDL3IMAGE_JPG@) | ||
| set(SDL3IMAGE_JXL @SDL3IMAGE_JXL@) | ||
| set(SDL3IMAGE_LBM @SDL3IMAGE_LBM@) | ||
| set(SDL3IMAGE_PCX @SDL3IMAGE_PCX@) | ||
| set(SDL3IMAGE_PNG @SDL3IMAGE_PNG@) | ||
| set(SDL3IMAGE_PNM @SDL3IMAGE_PNM@) | ||
| set(SDL3IMAGE_QOI @SDL3IMAGE_QOI@) | ||
| set(SDL3IMAGE_SVG @SDL3IMAGE_SVG@) | ||
| set(SDL3IMAGE_TGA @SDL3IMAGE_TGA@) | ||
| set(SDL3IMAGE_TIF @SDL3IMAGE_TIF@) | ||
| set(SDL3IMAGE_XCF @SDL3IMAGE_XCF@) | ||
| set(SDL3IMAGE_XPM @SDL3IMAGE_XPM@) | ||
| set(SDL3IMAGE_XV @SDL3IMAGE_XV@) | ||
| set(SDL3IMAGE_WEBP @SDL3IMAGE_WEBP@) | ||
|
|
||
| set(SDL3IMAGE_JPG_SAVE @SDL3IMAGE_JPG_SAVE@) | ||
| set(SDL3IMAGE_PNG_SAVE @SDL3IMAGE_PNG_SAVE@) | ||
|
|
||
| set(SDL3IMAGE_VENDORED @SDL3IMAGE_VENDORED@) | ||
|
|
||
| set(SDL3IMAGE_BACKEND_IMAGEIO @SDL3IMAGE_BACKEND_IMAGEIO@) | ||
| set(SDL3IMAGE_BACKEND_STB @SDL3IMAGE_BACKEND_STB@) | ||
| set(SDL3IMAGE_BACKEND_WIC @SDL3IMAGE_BACKEND_WIC@) | ||
|
|
||
| set(SDL3IMAGE_SDL3_REQUIRED_VERSION @SDL_REQUIRED_VERSION@) | ||
|
|
||
| if(NOT SDL3IMAGE_VENDORED) | ||
| set(_sdl_cmake_module_path "${CMAKE_MODULE_PATH}") | ||
| list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") | ||
| endif() | ||
|
|
||
| include(CMakeFindDependencyMacro) | ||
|
|
||
| if(SDL2IMAGE_AVIF AND NOT SDL2IMAGE_VENDORED AND NOT TARGET avif) | ||
| if(SDL3IMAGE_AVIF AND NOT SDL3IMAGE_VENDORED AND NOT TARGET avif) | ||
| find_dependency(libavif @LIBAVIF_MINIMUM_VERSION@) | ||
| endif() | ||
|
|
||
| if(SDL2IMAGE_JPG AND NOT SDL2IMAGE_VENDORED AND NOT TARGET JPEG::JPEG) | ||
| if(SDL3IMAGE_JPG AND NOT SDL3IMAGE_VENDORED AND NOT TARGET JPEG::JPEG) | ||
| find_dependency(JPEG) | ||
| endif() | ||
|
|
||
| if(SDL2IMAGE_JXL AND NOT SDL2IMAGE_VENDORED AND NOT TARGET libjxl::libjxl) | ||
| if(SDL3IMAGE_JXL AND NOT SDL3IMAGE_VENDORED AND NOT TARGET libjxl::libjxl) | ||
| list(APPEND libjxl_ROOT "${CMAKE_CURRENT_LIST_DIR}") | ||
| find_dependency(libjxl) | ||
| endif() | ||
|
|
||
| if(SDL2IMAGE_PNG AND NOT SDL2IMAGE_VENDORED AND NOT TARGET PNG::PNG) | ||
| if(SDL3IMAGE_PNG AND NOT SDL3IMAGE_VENDORED AND NOT TARGET PNG::PNG) | ||
| find_dependency(PNG) | ||
| endif() | ||
|
|
||
| if(SDL2IMAGE_TIF AND NOT SDL2IMAGE_VENDORED AND NOT TARGET TIFF::TIFF) | ||
| if(SDL3IMAGE_TIF AND NOT SDL3IMAGE_VENDORED AND NOT TARGET TIFF::TIFF) | ||
| find_dependency(TIFF) | ||
| endif() | ||
|
|
||
| if(SDL2IMAGE_WEBP AND NOT SDL2IMAGE_VENDORED AND NOT TARGET WebP::webp) | ||
| if(SDL3IMAGE_WEBP AND NOT SDL3IMAGE_VENDORED AND NOT TARGET WebP::webp) | ||
| list(APPEND webp_ROOT "${CMAKE_CURRENT_LIST_DIR}") | ||
| find_dependency(webp) | ||
| endif() | ||
|
|
||
| #FIXME: can't add SDL2IMAGE_SDL2_REQUIRED_VERSION since not all SDL2 installs ship SDL2ConfigVersion.cmake | ||
| if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/SDL2_image-shared-targets.cmake") | ||
| include("${CMAKE_CURRENT_LIST_DIR}/SDL2_image-shared-targets.cmake") | ||
| #FIXME: can't add SDL3IMAGE_SDL3_REQUIRED_VERSION since not all SDL3 installs ship SDL3ConfigVersion.cmake | ||
| if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/SDL3_image-shared-targets.cmake") | ||
| include("${CMAKE_CURRENT_LIST_DIR}/SDL3_image-shared-targets.cmake") | ||
| endif() | ||
|
|
||
| if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/SDL2_image-static-targets.cmake") | ||
| if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/SDL3_image-static-targets.cmake") | ||
| include(CheckLanguage) | ||
| check_language(CXX) | ||
| if(SDL2IMAGE_VENDORED AND NOT CMAKE_CXX_COMPILER AND NOT _sdl2image_nowarning) | ||
| message(WARNING "CXX language not enabled. Linking to SDL2_image::SDL2_image-static might fail.") | ||
| if(SDL3IMAGE_VENDORED AND NOT CMAKE_CXX_COMPILER AND NOT _sdl3image_nowarning) | ||
| message(WARNING "CXX language not enabled. Linking to SDL3_image::SDL3_image-static might fail.") | ||
| endif() | ||
| include("${CMAKE_CURRENT_LIST_DIR}/SDL2_image-static-targets.cmake") | ||
| include("${CMAKE_CURRENT_LIST_DIR}/SDL3_image-static-targets.cmake") | ||
| endif() | ||
|
|
||
| if(NOT SDL2IMAGE_VENDORED) | ||
| if(NOT SDL3IMAGE_VENDORED) | ||
| set(CMAKE_MODULE_PATH "${_sdl_cmake_module_path}") | ||
| unset(_sdl_cmake_module_path) | ||
| endif() |
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 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 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 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 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
Oops, something went wrong.