mirror of
https://github.com/ZDoom/zdoom-macos-deps.git
synced 2024-11-10 14:41:43 +00:00
deps: update sdl2_image to 2.6.3
This commit is contained in:
parent
0835e7eafd
commit
fbe4b7f24d
6 changed files with 48 additions and 40 deletions
4
deps/sdl2_image/include/SDL2/SDL_image.h
vendored
4
deps/sdl2_image/include/SDL2/SDL_image.h
vendored
|
@ -1,6 +1,6 @@
|
||||||
/*
|
/*
|
||||||
SDL_image: An example image loading library for use with SDL
|
SDL_image: An example image loading library for use with SDL
|
||||||
Copyright (C) 1997-2022 Sam Lantinga <slouken@libsdl.org>
|
Copyright (C) 1997-2023 Sam Lantinga <slouken@libsdl.org>
|
||||||
|
|
||||||
This software is provided 'as-is', without any express or implied
|
This software is provided 'as-is', without any express or implied
|
||||||
warranty. In no event will the authors be held liable for any damages
|
warranty. In no event will the authors be held liable for any damages
|
||||||
|
@ -43,7 +43,7 @@ extern "C" {
|
||||||
*/
|
*/
|
||||||
#define SDL_IMAGE_MAJOR_VERSION 2
|
#define SDL_IMAGE_MAJOR_VERSION 2
|
||||||
#define SDL_IMAGE_MINOR_VERSION 6
|
#define SDL_IMAGE_MINOR_VERSION 6
|
||||||
#define SDL_IMAGE_PATCHLEVEL 2
|
#define SDL_IMAGE_PATCHLEVEL 3
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This macro can be used to fill a version structure with the compile-time
|
* This macro can be used to fill a version structure with the compile-time
|
||||||
|
|
|
@ -12,8 +12,8 @@ set_target_properties(SDL2_image::SDL2_image-static PROPERTIES
|
||||||
IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libSDL2_image.a"
|
IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libSDL2_image.a"
|
||||||
)
|
)
|
||||||
|
|
||||||
list(APPEND _IMPORT_CHECK_TARGETS SDL2_image::SDL2_image-static )
|
list(APPEND _cmake_import_check_targets SDL2_image::SDL2_image-static )
|
||||||
list(APPEND _IMPORT_CHECK_FILES_FOR_SDL2_image::SDL2_image-static "${_IMPORT_PREFIX}/lib/libSDL2_image.a" )
|
list(APPEND _cmake_import_check_files_for_SDL2_image::SDL2_image-static "${_IMPORT_PREFIX}/lib/libSDL2_image.a" )
|
||||||
|
|
||||||
# Commands beyond this point should not need to know the version.
|
# Commands beyond this point should not need to know the version.
|
||||||
set(CMAKE_IMPORT_FILE_VERSION)
|
set(CMAKE_IMPORT_FILE_VERSION)
|
||||||
|
|
|
@ -1,10 +1,13 @@
|
||||||
# Generated by CMake
|
# Generated by CMake
|
||||||
|
|
||||||
if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5)
|
if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.8)
|
||||||
message(FATAL_ERROR "CMake >= 2.6.0 required")
|
message(FATAL_ERROR "CMake >= 2.8.0 required")
|
||||||
|
endif()
|
||||||
|
if(CMAKE_VERSION VERSION_LESS "2.8.3")
|
||||||
|
message(FATAL_ERROR "CMake >= 2.8.3 required")
|
||||||
endif()
|
endif()
|
||||||
cmake_policy(PUSH)
|
cmake_policy(PUSH)
|
||||||
cmake_policy(VERSION 2.6...3.19)
|
cmake_policy(VERSION 2.8.3...3.23)
|
||||||
#----------------------------------------------------------------
|
#----------------------------------------------------------------
|
||||||
# Generated CMake target import file.
|
# Generated CMake target import file.
|
||||||
#----------------------------------------------------------------
|
#----------------------------------------------------------------
|
||||||
|
@ -13,32 +16,34 @@ cmake_policy(VERSION 2.6...3.19)
|
||||||
set(CMAKE_IMPORT_FILE_VERSION 1)
|
set(CMAKE_IMPORT_FILE_VERSION 1)
|
||||||
|
|
||||||
# Protect against multiple inclusion, which would fail when already imported targets are added once more.
|
# Protect against multiple inclusion, which would fail when already imported targets are added once more.
|
||||||
set(_targetsDefined)
|
set(_cmake_targets_defined "")
|
||||||
set(_targetsNotDefined)
|
set(_cmake_targets_not_defined "")
|
||||||
set(_expectedTargets)
|
set(_cmake_expected_targets "")
|
||||||
foreach(_expectedTarget SDL2_image::SDL2_image-static)
|
foreach(_cmake_expected_target IN ITEMS SDL2_image::SDL2_image-static)
|
||||||
list(APPEND _expectedTargets ${_expectedTarget})
|
list(APPEND _cmake_expected_targets "${_cmake_expected_target}")
|
||||||
if(NOT TARGET ${_expectedTarget})
|
if(TARGET "${_cmake_expected_target}")
|
||||||
list(APPEND _targetsNotDefined ${_expectedTarget})
|
list(APPEND _cmake_targets_defined "${_cmake_expected_target}")
|
||||||
endif()
|
else()
|
||||||
if(TARGET ${_expectedTarget})
|
list(APPEND _cmake_targets_not_defined "${_cmake_expected_target}")
|
||||||
list(APPEND _targetsDefined ${_expectedTarget})
|
|
||||||
endif()
|
endif()
|
||||||
endforeach()
|
endforeach()
|
||||||
if("${_targetsDefined}" STREQUAL "${_expectedTargets}")
|
unset(_cmake_expected_target)
|
||||||
unset(_targetsDefined)
|
if(_cmake_targets_defined STREQUAL _cmake_expected_targets)
|
||||||
unset(_targetsNotDefined)
|
unset(_cmake_targets_defined)
|
||||||
unset(_expectedTargets)
|
unset(_cmake_targets_not_defined)
|
||||||
set(CMAKE_IMPORT_FILE_VERSION)
|
unset(_cmake_expected_targets)
|
||||||
|
unset(CMAKE_IMPORT_FILE_VERSION)
|
||||||
cmake_policy(POP)
|
cmake_policy(POP)
|
||||||
return()
|
return()
|
||||||
endif()
|
endif()
|
||||||
if(NOT "${_targetsDefined}" STREQUAL "")
|
if(NOT _cmake_targets_defined STREQUAL "")
|
||||||
message(FATAL_ERROR "Some (but not all) targets in this export set were already defined.\nTargets Defined: ${_targetsDefined}\nTargets not yet defined: ${_targetsNotDefined}\n")
|
string(REPLACE ";" ", " _cmake_targets_defined_text "${_cmake_targets_defined}")
|
||||||
|
string(REPLACE ";" ", " _cmake_targets_not_defined_text "${_cmake_targets_not_defined}")
|
||||||
|
message(FATAL_ERROR "Some (but not all) targets in this export set were already defined.\nTargets Defined: ${_cmake_targets_defined_text}\nTargets not yet defined: ${_cmake_targets_not_defined_text}\n")
|
||||||
endif()
|
endif()
|
||||||
unset(_targetsDefined)
|
unset(_cmake_targets_defined)
|
||||||
unset(_targetsNotDefined)
|
unset(_cmake_targets_not_defined)
|
||||||
unset(_expectedTargets)
|
unset(_cmake_expected_targets)
|
||||||
|
|
||||||
|
|
||||||
# Compute the installation prefix relative to this file.
|
# Compute the installation prefix relative to this file.
|
||||||
|
@ -62,21 +67,22 @@ if(CMAKE_VERSION VERSION_LESS 2.8.12)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Load information for each installed configuration.
|
# Load information for each installed configuration.
|
||||||
get_filename_component(_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
|
file(GLOB _cmake_config_files "${CMAKE_CURRENT_LIST_DIR}/SDL2_image-static-targets-*.cmake")
|
||||||
file(GLOB CONFIG_FILES "${_DIR}/SDL2_image-static-targets-*.cmake")
|
foreach(_cmake_config_file IN LISTS _cmake_config_files)
|
||||||
foreach(f ${CONFIG_FILES})
|
include("${_cmake_config_file}")
|
||||||
include(${f})
|
|
||||||
endforeach()
|
endforeach()
|
||||||
|
unset(_cmake_config_file)
|
||||||
|
unset(_cmake_config_files)
|
||||||
|
|
||||||
# Cleanup temporary variables.
|
# Cleanup temporary variables.
|
||||||
set(_IMPORT_PREFIX)
|
set(_IMPORT_PREFIX)
|
||||||
|
|
||||||
# Loop over all imported files and verify that they actually exist
|
# Loop over all imported files and verify that they actually exist
|
||||||
foreach(target ${_IMPORT_CHECK_TARGETS} )
|
foreach(_cmake_target IN LISTS _cmake_import_check_targets)
|
||||||
foreach(file ${_IMPORT_CHECK_FILES_FOR_${target}} )
|
foreach(_cmake_file IN LISTS "_cmake_import_check_files_for_${_cmake_target}")
|
||||||
if(NOT EXISTS "${file}" )
|
if(NOT EXISTS "${_cmake_file}")
|
||||||
message(FATAL_ERROR "The imported target \"${target}\" references the file
|
message(FATAL_ERROR "The imported target \"${_cmake_target}\" references the file
|
||||||
\"${file}\"
|
\"${_cmake_file}\"
|
||||||
but this file does not exist. Possible reasons include:
|
but this file does not exist. Possible reasons include:
|
||||||
* The file was deleted, renamed, or moved to another location.
|
* The file was deleted, renamed, or moved to another location.
|
||||||
* An install or uninstall procedure did not complete successfully.
|
* An install or uninstall procedure did not complete successfully.
|
||||||
|
@ -86,9 +92,11 @@ but not all the files it references.
|
||||||
")
|
")
|
||||||
endif()
|
endif()
|
||||||
endforeach()
|
endforeach()
|
||||||
unset(_IMPORT_CHECK_FILES_FOR_${target})
|
unset(_cmake_file)
|
||||||
|
unset("_cmake_import_check_files_for_${_cmake_target}")
|
||||||
endforeach()
|
endforeach()
|
||||||
unset(_IMPORT_CHECK_TARGETS)
|
unset(_cmake_target)
|
||||||
|
unset(_cmake_import_check_targets)
|
||||||
|
|
||||||
# This file does not depend on other imported targets which have
|
# This file does not depend on other imported targets which have
|
||||||
# been exported from the same project but in a separate export set.
|
# been exported from the same project but in a separate export set.
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version.
|
# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version.
|
||||||
# The variable CVF_VERSION must be set before calling configure_file().
|
# The variable CVF_VERSION must be set before calling configure_file().
|
||||||
|
|
||||||
set(PACKAGE_VERSION "2.6.2")
|
set(PACKAGE_VERSION "2.6.3")
|
||||||
|
|
||||||
if (PACKAGE_FIND_VERSION_RANGE)
|
if (PACKAGE_FIND_VERSION_RANGE)
|
||||||
# Package version must be in the requested version range
|
# Package version must be in the requested version range
|
||||||
|
|
BIN
deps/sdl2_image/lib/libSDL2_image.a
vendored
BIN
deps/sdl2_image/lib/libSDL2_image.a
vendored
Binary file not shown.
2
deps/sdl2_image/lib/pkgconfig/SDL2_image.pc
vendored
2
deps/sdl2_image/lib/pkgconfig/SDL2_image.pc
vendored
|
@ -5,7 +5,7 @@ includedir=${prefix}/include
|
||||||
|
|
||||||
Name: SDL2_image
|
Name: SDL2_image
|
||||||
Description: image loading library for Simple DirectMedia Layer
|
Description: image loading library for Simple DirectMedia Layer
|
||||||
Version: 2.6.2
|
Version: 2.6.3
|
||||||
Requires: sdl2 >= 2.0.9
|
Requires: sdl2 >= 2.0.9
|
||||||
Requires.private:
|
Requires.private:
|
||||||
Libs: -L${libdir} -lSDL2_image
|
Libs: -L${libdir} -lSDL2_image
|
||||||
|
|
Loading…
Reference in a new issue