diff --git a/CMakeLists.txt b/CMakeLists.txt index b02f6b514..fcccfcb3d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -333,8 +333,7 @@ elseif(WIN32) ${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/FreeImage/Dist/x64 - ${CMAKE_CURRENT_SOURCE_DIR}/external/freetype/include # MinGW - ${CMAKE_CURRENT_SOURCE_DIR}/external/freetype2/include # MSVC + ${CMAKE_CURRENT_SOURCE_DIR}/external/freetype/include ${CMAKE_CURRENT_SOURCE_DIR}/external/pugixml/src ${CMAKE_CURRENT_SOURCE_DIR}/external/SDL2-2.0.18) else() diff --git a/tools/Windows_dependencies_build_MSVC.bat b/tools/Windows_dependencies_build_MSVC.bat index 6fe8179d6..465b56cd0 100644 --- a/tools/Windows_dependencies_build_MSVC.bat +++ b/tools/Windows_dependencies_build_MSVC.bat @@ -28,7 +28,7 @@ cd external echo Building FreeType -cd freetype2\build +cd freetype\build if exist CMakeCache.txt ( nmake clean del CMakeCache.txt diff --git a/tools/Windows_dependencies_setup_MSVC.bat b/tools/Windows_dependencies_setup_MSVC.bat index 3e2b5e9e5..57a75ca6b 100644 --- a/tools/Windows_dependencies_setup_MSVC.bat +++ b/tools/Windows_dependencies_setup_MSVC.bat @@ -68,13 +68,13 @@ copy /Y glew-2.1.0\lib\Release\x64\glew32.lib .. echo: echo Setting up FreeType -if exist freetype2\ ( - rmdir /S /Q freetype2 +if exist freetype\ ( + rmdir /S /Q freetype ) -git clone git://git.savannah.gnu.org/freetype/freetype2.git -cd freetype2 -git checkout VER-2-10-4 +git clone https://github.com/freetype/freetype.git +cd freetype +git checkout VER-2-11-1 mkdir build cd .. @@ -97,7 +97,7 @@ if exist pugixml\ ( rmdir /S /Q pugixml ) -git clone git://github.com/zeux/pugixml.git +git clone https://github.com/zeux/pugixml.git cd pugixml git checkout v1.10 cd .. diff --git a/tools/Windows_dependencies_setup_MinGW.sh b/tools/Windows_dependencies_setup_MinGW.sh index a5747813a..209961bc5 100644 --- a/tools/Windows_dependencies_setup_MinGW.sh +++ b/tools/Windows_dependencies_setup_MinGW.sh @@ -37,7 +37,7 @@ rm -rf freetype git clone https://github.com/freetype/freetype.git cd freetype -git checkout VER-2-11-0 +git checkout VER-2-11-1 mkdir build cd .. @@ -51,7 +51,7 @@ cp -p FreeImage/Dist/x64/FreeImage.dll .. echo -e "\nSetting up pugixml" rm -rf pugixml -git clone git://github.com/zeux/pugixml.git +git clone https://github.com/zeux/pugixml.git cd pugixml git checkout v1.11.4 cd .. diff --git a/tools/macOS_dependencies_setup.sh b/tools/macOS_dependencies_setup.sh index fcca928d7..3b9e0743c 100755 --- a/tools/macOS_dependencies_setup.sh +++ b/tools/macOS_dependencies_setup.sh @@ -125,7 +125,7 @@ cd ../.. echo "\nSetting up pugixml" rm -rf pugixml -git clone git://github.com/zeux/pugixml.git +git clone https://github.com/zeux/pugixml.git cd pugixml git checkout v1.11.4 cd ..