speed-dreams/speed-dreams-code
speed-dreams/speed-dreams-code
7
1
Fork 3
Code Issues 9 Pull requests Projects Releases 1 Packages Wiki Activity Actions 6

Update SDL2 to 2.0.16

Browse source 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@7630 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 5f1a865b3b563226f578d78cab745eb77b0c1142
Former-commit-id: a4f8eda582393c66dba30d6a4ea24e9afe2e3e39
This commit is contained in:
beaglejoe 2021-08-21 20:59:59 +00:00
parent dc4a08667a
commit 789023295c
3 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
packaging/3rdParty-devel/CMakeLists.txt
View file

@ -166,6 +166,11 @@ endif(OPTION_SDL_1x)
# TODO - need to disable SDL2 static (it is overwritten by dll's SDL2.lib)
# message(WARNING "TODO - need to disable SDL2 static (it is overwritten by dll's SDL2.lib)")
# TODO remove ExternalProject_Add_Step(${SDL2_PROJECT} sdl2config_fix_cmake ...)
# when SDL issue #4661 is fixed
# SDL2Config.cmake is broken since 2.0.16 #4661
# https://github.com/libsdl-org/SDL/issues/4661
if(OPTION_SDL_2x)
set(SDL2_ARGS ${EXTERNALS_CMAKE_ARGS} -DSDL_STATIC=Off -DSDL_CMAKE_DEBUG_POSTFIX=)
ExternalProject_Add(${SDL2_PROJECT}
@ -173,6 +178,12 @@ if(OPTION_SDL_2x)
URL_HASH ${SDL2_HASH}
CMAKE_ARGS ${SDL2_ARGS}
DEPENDS OpenGL-headers)
ExternalProject_Add_Step(${SDL2_PROJECT} sdl2config_fix_cmake
COMMAND ${CMAKE_COMMAND} -E copy_if_different
"${CMAKE_SOURCE_DIR}/patches/${SDL2_PROJECT}.SDL2Config.cmake"
"<SOURCE_DIR>/SDL2Config.cmake"
DEPENDEES update # do after update
DEPENDERS patch) # do before patch
else(OPTION_SDL_2x)
set(SDL2_PROJECT )
endif(OPTION_SDL_2x)

1
packaging/3rdParty-devel/patches/sdl2-2.0.16.SDL2Config.cmake Normal file
View file

@ -0,0 +1 @@
include("${CMAKE_CURRENT_LIST_DIR}/SDL2Targets.cmake")

4
packaging/3rdParty-devel/thirdpartydefinitions.cmake
View file

@ -42,11 +42,11 @@ set(SDL1_URL https://www.libsdl.org/release/${SDL1_FILE})
set(SDL1_HASH SHA256=d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00)
# SDL2
set(SDL2_VERSION 2.0.14)
set(SDL2_VERSION 2.0.16)
set(SDL2_PROJECT SDL2-${SDL2_VERSION})
set(SDL2_FILE ${SDL2_PROJECT}.tar.gz)
set(SDL2_URL https://www.libsdl.org/release/${SDL2_FILE})
set(SDL2_HASH SHA256=d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc)
set(SDL2_HASH SHA256=65be9ff6004034b5b2ce9927b5a4db1814930f169c4b2dae0a1e4697075f287b)
# SDL2_MIXER
set(SDL2_MIXER_VERSION 2.0.4)