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 FreeType to 2.12.1 and pugixml to 1.12.1 on Windows and macOS and curl to 7.86.0 on Windows.

Browse source
This commit is contained in:
Leon Styhre 2022-10-30 17:50:32 +01:00
parent 5f5e223e77
commit 3da54a22be
4 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -395,13 +395,13 @@ if(APPLE)
${CMAKE_CURRENT_SOURCE_DIR}/external/SDL) ${CMAKE_CURRENT_SOURCE_DIR}/external/SDL)
elseif(WIN32) elseif(WIN32)
set(COMMON_INCLUDE_DIRS ${COMMON_INCLUDE_DIRS} set(COMMON_INCLUDE_DIRS ${COMMON_INCLUDE_DIRS}
${CMAKE_CURRENT_SOURCE_DIR}/external/curl-7.80.0-win64-mingw/include ${CMAKE_CURRENT_SOURCE_DIR}/external/curl-7.86.0-win64-mingw/include
${CMAKE_CURRENT_SOURCE_DIR}/external/glew-2.1.0/include ${CMAKE_CURRENT_SOURCE_DIR}/external/glew-2.1.0/include
${CMAKE_CURRENT_SOURCE_DIR}/external/ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1/include ${CMAKE_CURRENT_SOURCE_DIR}/external/ffmpeg-n5.1.2-1-g05d6157aab-win64-gpl-shared-5.1/include
${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.0) ${CMAKE_CURRENT_SOURCE_DIR}/external/SDL2-2.24.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

16
tools/Windows_dependencies_setup_MSVC.bat
View file

@ -35,20 +35,20 @@ cd external
echo Setting up curl echo Setting up curl
if exist curl-7.80.0-win64-mingw\ ( if exist curl-7.86.0-win64-mingw\ (
rmdir /S /Q curl-7.80.0-win64-mingw rmdir /S /Q curl-7.86.0-win64-mingw
) )
curl -O https://curl.se/windows/dl-7.80.0_2/curl-7.80.0_2-win64-mingw.zip curl -O https://curl.se/windows/dl-7.86.0/curl-7.86.0-win64-mingw.zip
7z x curl-7.80.0_2-win64-mingw.zip 7z x curl-7.86.0-win64-mingw.zip
if not exist curl-7.80.0-win64-mingw\bin\ ( if not exist curl-7.86.0-win64-mingw\bin\ (
echo curl directory is missing, aborting. echo curl directory is missing, aborting.
cd .. cd ..
goto end goto end
) )
cd curl-7.80.0-win64-mingw\bin cd curl-7.86.0-win64-mingw\bin
dumpbin /exports libcurl-x64.dll > exports.txt dumpbin /exports libcurl-x64.dll > exports.txt
echo LIBRARY libcurl-x64 > libcurl-x64.def echo LIBRARY libcurl-x64 > libcurl-x64.def
@ -95,7 +95,7 @@ if not exist freetype\ (
) )
cd freetype cd freetype
git checkout VER-2-11-1 git checkout VER-2-12-1
mkdir build mkdir build
cd .. cd ..
@ -134,7 +134,7 @@ if not exist pugixml\ (
) )
cd pugixml cd pugixml
git checkout v1.10 git checkout v1.12.1
cd .. cd ..
echo: echo:

12
tools/Windows_dependencies_setup_MinGW.sh
View file

@ -22,15 +22,15 @@ cd external
echo -e "\nSetting up curl" echo -e "\nSetting up curl"
rm -rf curl-* rm -rf curl-*
curl -O https://curl.se/windows/dl-7.80.0_2/curl-7.80.0_2-win64-mingw.zip curl -O https://curl.se/windows/dl-7.86.0/curl-7.86.0-win64-mingw.zip
unzip curl-7.80.0_2-win64-mingw.zip unzip curl-7.86.0-win64-mingw.zip
if [ ! -d curl-7.80.0-win64-mingw ]; then if [ ! -d curl-7.86.0-win64-mingw ]; then
echo "curl directory is missing, aborting." echo "curl directory is missing, aborting."
exit exit
fi fi
cp -p curl-7.80.0-win64-mingw/bin/libcurl-x64.dll .. cp -p curl-7.86.0-win64-mingw/bin/libcurl-x64.dll ..
echo -e "\nSetting up GLEW" echo -e "\nSetting up GLEW"
rm -rf glew-* rm -rf glew-*
@ -49,7 +49,7 @@ if [ ! -d freetype ]; then
fi fi
cd freetype cd freetype
git checkout VER-2-11-1 git checkout VER-2-12-1
mkdir build mkdir build
cd .. cd ..
@ -77,7 +77,7 @@ if [ ! -d pugixml ]; then
fi fi
cd pugixml cd pugixml
git checkout v1.11.4 git checkout v1.12.1
cd .. cd ..
echo -e "\nSetting up SDL" echo -e "\nSetting up SDL"

8
tools/macOS_dependencies_setup.sh
View file

@ -32,7 +32,7 @@ fi
mv code libpng mv code libpng
cd libpng cd libpng
git checkout v1.6.37 git checkout v1.6.38
cd .. cd ..
echo "\nSetting up FreeType" echo "\nSetting up FreeType"
@ -45,7 +45,7 @@ if [ ! -d freetype ]; then
fi fi
cd freetype cd freetype
git checkout VER-2-11-0 git checkout VER-2-12-1
mkdir build mkdir build
cd .. cd ..
@ -174,7 +174,7 @@ if [ ! -d pugixml ]; then
fi fi
cd pugixml cd pugixml
git checkout v1.11.4 git checkout v1.12.1
cd .. cd ..
echo "\nSetting up SDL" echo "\nSetting up SDL"
@ -202,7 +202,7 @@ if [ ! -d libvpx ]; then
fi fi
cd libvpx cd libvpx
git checkout v1.11.0 git checkout v1.12.0
cd .. cd ..
echo "\nSetting up Ogg" echo "\nSetting up Ogg"