Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-22 06:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated SDL from 2.24.1 to 2.26.1

Browse source
This commit is contained in:
Leon Styhre 2022-12-15 20:13:37 +01:00
parent c63fd2e72b
commit 46e17ced6f
8 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -401,7 +401,7 @@ elseif(WIN32)
${CMAKE_CURRENT_SOURCE_DIR}/external/FreeImage/Dist/x64 ${CMAKE_CURRENT_SOURCE_DIR}/external/FreeImage/Dist/x64
${CMAKE_CURRENT_SOURCE_DIR}/external/freetype/include ${CMAKE_CURRENT_SOURCE_DIR}/external/freetype/include
${CMAKE_CURRENT_SOURCE_DIR}/external/pugixml/src ${CMAKE_CURRENT_SOURCE_DIR}/external/pugixml/src
${CMAKE_CURRENT_SOURCE_DIR}/external/SDL2-2.24.1) ${CMAKE_CURRENT_SOURCE_DIR}/external/SDL2-2.26.1)
elseif(EMSCRIPTEN) elseif(EMSCRIPTEN)
set(COMMON_INCLUDE_DIRS ${COMMON_INCLUDE_DIRS} set(COMMON_INCLUDE_DIRS ${COMMON_INCLUDE_DIRS}
${CMAKE_CURRENT_SOURCE_DIR}/external/curl/include ${CMAKE_CURRENT_SOURCE_DIR}/external/curl/include
@ -450,7 +450,7 @@ if(APPLE)
${PROJECT_SOURCE_DIR}/libfreeimage.a ${PROJECT_SOURCE_DIR}/libfreeimage.a
${PROJECT_SOURCE_DIR}/libfreetype.6.dylib ${PROJECT_SOURCE_DIR}/libfreetype.6.dylib
${PROJECT_SOURCE_DIR}/libpugixml.a ${PROJECT_SOURCE_DIR}/libpugixml.a
${PROJECT_SOURCE_DIR}/libSDL2-2.0.dylib) ${PROJECT_SOURCE_DIR}/libSDL2-2.0.0.dylib)
elseif(WIN32) elseif(WIN32)
if(CMAKE_CXX_COMPILER_ID MATCHES MSVC) if(CMAKE_CXX_COMPILER_ID MATCHES MSVC)
set(COMMON_LIBRARIES ${PROJECT_SOURCE_DIR}/avcodec.lib set(COMMON_LIBRARIES ${PROJECT_SOURCE_DIR}/avcodec.lib

2
es-app/CMakeLists.txt
View file

@ -209,7 +209,7 @@ elseif(APPLE)
PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS)
install(FILES ${CMAKE_SOURCE_DIR}/libfreetype.6.dylib install(FILES ${CMAKE_SOURCE_DIR}/libfreetype.6.dylib
PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS)
install(FILES ${CMAKE_SOURCE_DIR}/libSDL2-2.0.dylib install(FILES ${CMAKE_SOURCE_DIR}/libSDL2-2.0.0.dylib
PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS) PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS)
install(FILES ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION ../Resources) install(FILES ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION ../Resources)

18
tools/Windows_dependencies_setup_MSVC.bat
View file

@ -140,26 +140,26 @@ cd ..
echo: echo:
echo Setting up SDL echo Setting up SDL
if exist SDL2-2.24.1\ ( if exist SDL2-2.26.1\ (
rmdir /S /Q SDL2-2.24.1 rmdir /S /Q SDL2-2.26.1
) )
curl -LO https://libsdl.org/release/SDL2-devel-2.24.1-VC.zip curl -LO https://libsdl.org/release/SDL2-devel-2.26.1-VC.zip
7z x SDL2-devel-2.24.1-VC.zip 7z x SDL2-devel-2.26.1-VC.zip
if not exist SDL2-2.24.1\ ( if not exist SDL2-2.26.1\ (
echo SDL directory is missing, aborting. echo SDL directory is missing, aborting.
cd .. cd ..
goto end goto end
) )
cd SDL2-2.24.1 cd SDL2-2.26.1
rename include SDL2 rename include SDL2
cd .. cd ..
copy /Y SDL2-2.24.1\lib\x64\SDL2.dll .. copy /Y SDL2-2.26.1\lib\x64\SDL2.dll ..
copy /Y SDL2-2.24.1\lib\x64\SDL2.lib .. copy /Y SDL2-2.26.1\lib\x64\SDL2.lib ..
copy /Y SDL2-2.24.1\lib\x64\SDL2main.lib .. copy /Y SDL2-2.26.1\lib\x64\SDL2main.lib ..
echo: echo:
echo Setting up FFmpeg echo Setting up FFmpeg

12
tools/Windows_dependencies_setup_MinGW.sh
View file

@ -83,20 +83,20 @@ cd ..
echo -e "\nSetting up SDL" echo -e "\nSetting up SDL"
rm -rf SDL2-* rm -rf SDL2-*
curl -O https://libsdl.org/release/SDL2-devel-2.24.1-mingw.tar.gz curl -O https://libsdl.org/release/SDL2-devel-2.26.1-mingw.tar.gz
tar xvzf SDL2-devel-2.24.1-mingw.tar.gz tar xvzf SDL2-devel-2.26.1-mingw.tar.gz
# Needed due to some kind of file system race condition that sometimes occurs on Windows. # Needed due to some kind of file system race condition that sometimes occurs on Windows.
sleep 1 sleep 1
if [ ! -d SDL2-2.24.1 ]; then if [ ! -d SDL2-2.26.1 ]; then
echo "SDL directory is missing, aborting." echo "SDL directory is missing, aborting."
exit exit
fi fi
mv SDL2-2.24.1/x86_64-w64-mingw32/include/SDL2 SDL2-2.24.1/ mv SDL2-2.26.1/x86_64-w64-mingw32/include/SDL2 SDL2-2.26.1/
cp -p SDL2-2.24.1/x86_64-w64-mingw32/lib/libSDL2main.a .. cp -p SDL2-2.26.1/x86_64-w64-mingw32/lib/libSDL2main.a ..
cp -p SDL2-2.24.1/x86_64-w64-mingw32/bin/SDL2.dll .. cp -p SDL2-2.26.1/x86_64-w64-mingw32/bin/SDL2.dll ..
echo -e "\nSetting up FFmpeg" echo -e "\nSetting up FFmpeg"
rm -rf ffmpeg-* rm -rf ffmpeg-*

4
tools/create_AppImage.sh
View file

@ -17,8 +17,8 @@
# How many CPU threads to use for the compilation. # How many CPU threads to use for the compilation.
JOBS=4 JOBS=4
SDL_RELEASE_TAG=release-2.24.1 SDL_RELEASE_TAG=release-2.26.1
SDL_SHARED_LIBRARY=libSDL2-2.0.so.0.2400.1 SDL_SHARED_LIBRARY=libSDL2-2.0.so.0.2600.1
echo "Building AppImage..." echo "Building AppImage..."

4
tools/create_AppImage_SteamDeck.sh
View file

@ -13,8 +13,8 @@
# How many CPU threads to use for the compilation. # How many CPU threads to use for the compilation.
JOBS=4 JOBS=4
SDL_RELEASE_TAG=release-2.24.1 SDL_RELEASE_TAG=release-2.26.1
SDL_SHARED_LIBRARY=libSDL2-2.0.so.0.2400.1 SDL_SHARED_LIBRARY=libSDL2-2.0.so.0.2600.1
echo "Building Steam Deck AppImage..." echo "Building Steam Deck AppImage..."

2
tools/macOS_dependencies_build.sh
View file

@ -107,7 +107,7 @@ rm -f CMakeCache.txt
cmake -DCMAKE_BUILD_TYPE=Release -S .. -B . cmake -DCMAKE_BUILD_TYPE=Release -S .. -B .
make clean make clean
make -j${JOBS} make -j${JOBS}
cp libSDL2-2.0.dylib ../../.. cp libSDL2-2.0.0.dylib ../../..
cd ../.. cd ../..
echo "\nBuilding libvpx" echo "\nBuilding libvpx"

2
tools/macOS_dependencies_setup.sh
View file

@ -187,7 +187,7 @@ if [ ! -d SDL ]; then
fi fi
cd SDL cd SDL
git checkout release-2.24.1 git checkout release-2.26.1
ln -s include SDL2 ln -s include SDL2
mkdir build mkdir build
cd .. cd ..