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

(Windows) Fixed some build script issues.

Browse source
This commit is contained in:
Leon Styhre 2022-01-11 17:33:34 +01:00
parent d45a67eeab
commit c477c12dde
5 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -333,8 +333,7 @@ elseif(WIN32)
${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-n4.4-latest-win64-gpl-shared-4.4/include ${CMAKE_CURRENT_SOURCE_DIR}/external/ffmpeg-n4.4-latest-win64-gpl-shared-4.4/include
${CMAKE_CURRENT_SOURCE_DIR}/external/FreeImage/Dist/x64 ${CMAKE_CURRENT_SOURCE_DIR}/external/FreeImage/Dist/x64
${CMAKE_CURRENT_SOURCE_DIR}/external/freetype/include # MinGW ${CMAKE_CURRENT_SOURCE_DIR}/external/freetype/include
${CMAKE_CURRENT_SOURCE_DIR}/external/freetype2/include # MSVC
${CMAKE_CURRENT_SOURCE_DIR}/external/pugixml/src ${CMAKE_CURRENT_SOURCE_DIR}/external/pugixml/src
${CMAKE_CURRENT_SOURCE_DIR}/external/SDL2-2.0.18) ${CMAKE_CURRENT_SOURCE_DIR}/external/SDL2-2.0.18)
else() else()

2
tools/Windows_dependencies_build_MSVC.bat
View file

@ -28,7 +28,7 @@ cd external
echo Building FreeType echo Building FreeType
cd freetype2\build cd freetype\build
if exist CMakeCache.txt ( if exist CMakeCache.txt (
nmake clean nmake clean
del CMakeCache.txt del CMakeCache.txt

12
tools/Windows_dependencies_setup_MSVC.bat
View file

@ -68,13 +68,13 @@ copy /Y glew-2.1.0\lib\Release\x64\glew32.lib ..
echo: echo:
echo Setting up FreeType echo Setting up FreeType
if exist freetype2\ ( if exist freetype\ (
rmdir /S /Q freetype2 rmdir /S /Q freetype
) )
git clone git://git.savannah.gnu.org/freetype/freetype2.git git clone https://github.com/freetype/freetype.git
cd freetype2 cd freetype
git checkout VER-2-10-4 git checkout VER-2-11-1
mkdir build mkdir build
cd .. cd ..
@ -97,7 +97,7 @@ if exist pugixml\ (
rmdir /S /Q pugixml rmdir /S /Q pugixml
) )
git clone git://github.com/zeux/pugixml.git git clone https://github.com/zeux/pugixml.git
cd pugixml cd pugixml
git checkout v1.10 git checkout v1.10
cd .. cd ..

4
tools/Windows_dependencies_setup_MinGW.sh
View file

@ -37,7 +37,7 @@ rm -rf freetype
git clone https://github.com/freetype/freetype.git git clone https://github.com/freetype/freetype.git
cd freetype cd freetype
git checkout VER-2-11-0 git checkout VER-2-11-1
mkdir build mkdir build
cd .. cd ..
@ -51,7 +51,7 @@ cp -p FreeImage/Dist/x64/FreeImage.dll ..
echo -e "\nSetting up pugixml" echo -e "\nSetting up pugixml"
rm -rf pugixml rm -rf pugixml
git clone git://github.com/zeux/pugixml.git git clone https://github.com/zeux/pugixml.git
cd pugixml cd pugixml
git checkout v1.11.4 git checkout v1.11.4
cd .. cd ..

2
tools/macOS_dependencies_setup.sh
View file

@ -125,7 +125,7 @@ cd ../..
echo "\nSetting up pugixml" echo "\nSetting up pugixml"
rm -rf pugixml rm -rf pugixml
git clone git://github.com/zeux/pugixml.git git clone https://github.com/zeux/pugixml.git
cd pugixml cd pugixml
git checkout v1.11.4 git checkout v1.11.4
cd .. cd ..