diff --git a/cmake/Config.cmake b/cmake/Config.cmake index 9b222d07a..0d3153a76 100644 --- a/cmake/Config.cmake +++ b/cmake/Config.cmake @@ -47,7 +47,7 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "^NetBSD$") set(OPENGL_ES 0) elseif(${CMAKE_SYSTEM_NAME} STREQUAL "iOS") set(SFML_OS_IOS 1) - + # use the OpenGL ES implementation on iOS set(OPENGL_ES 1) elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") @@ -84,19 +84,11 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang") set(SFML_COMPILER_CLANG 1) execute_process(COMMAND "${CMAKE_CXX_COMPILER}" "-v" OUTPUT_VARIABLE CLANG_COMPILER_VERSION ERROR_VARIABLE CLANG_COMPILER_VERSION) - - if("${CLANG_COMPILER_VERSION}" MATCHES "ucrt") - set(SFML_RUNTIME_UCRT 1) - endif() elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU") set(SFML_COMPILER_GCC 1) execute_process(COMMAND "${CMAKE_CXX_COMPILER}" "-v" OUTPUT_VARIABLE GCC_COMPILER_VERSION ERROR_VARIABLE GCC_COMPILER_VERSION) string(REGEX MATCHALL ".*(tdm[64]*-[1-9]).*" SFML_COMPILER_GCC_TDM "${GCC_COMPILER_VERSION}") - - if("${GCC_COMPILER_VERSION}" MATCHES "ucrt") - set(SFML_RUNTIME_UCRT 1) - endif() else() message(WARNING "Unrecognized compiler: ${CMAKE_CXX_COMPILER_ID}. Use at your own risk.") endif() diff --git a/extlibs/libs-mingw-ucrt/x64/libFLAC.a b/extlibs/libs-mingw-ucrt/x64/libFLAC.a deleted file mode 100644 index 523c71963..000000000 Binary files a/extlibs/libs-mingw-ucrt/x64/libFLAC.a and /dev/null differ diff --git a/extlibs/libs-mingw-ucrt/x64/libfreetype.a b/extlibs/libs-mingw-ucrt/x64/libfreetype.a deleted file mode 100644 index a1e5ed574..000000000 Binary files a/extlibs/libs-mingw-ucrt/x64/libfreetype.a and /dev/null differ diff --git a/extlibs/libs-mingw-ucrt/x86/libFLAC.a b/extlibs/libs-mingw-ucrt/x86/libFLAC.a deleted file mode 100644 index bea890ae1..000000000 Binary files a/extlibs/libs-mingw-ucrt/x86/libFLAC.a and /dev/null differ diff --git a/extlibs/libs-mingw-ucrt/x86/libfreetype.a b/extlibs/libs-mingw-ucrt/x86/libfreetype.a deleted file mode 100644 index 71eac0d41..000000000 Binary files a/extlibs/libs-mingw-ucrt/x86/libfreetype.a and /dev/null differ diff --git a/extlibs/libs-msvc-universal/ARM64/flac.lib b/extlibs/libs-msvc-universal/ARM64/flac.lib deleted file mode 100644 index e8e4c4ded..000000000 Binary files a/extlibs/libs-msvc-universal/ARM64/flac.lib and /dev/null differ diff --git a/extlibs/libs-msvc-universal/ARM64/freetype.lib b/extlibs/libs-msvc-universal/ARM64/freetype.lib deleted file mode 100644 index a56097437..000000000 Binary files a/extlibs/libs-msvc-universal/ARM64/freetype.lib and /dev/null differ diff --git a/extlibs/libs-msvc-universal/ARM64/ogg.lib b/extlibs/libs-msvc-universal/ARM64/ogg.lib deleted file mode 100644 index 6bfefb350..000000000 Binary files a/extlibs/libs-msvc-universal/ARM64/ogg.lib and /dev/null differ diff --git a/extlibs/libs-msvc-universal/ARM64/vorbis.lib b/extlibs/libs-msvc-universal/ARM64/vorbis.lib deleted file mode 100644 index d59f33b9a..000000000 Binary files a/extlibs/libs-msvc-universal/ARM64/vorbis.lib and /dev/null differ diff --git a/extlibs/libs-msvc-universal/ARM64/vorbisenc.lib b/extlibs/libs-msvc-universal/ARM64/vorbisenc.lib deleted file mode 100644 index a700b1de6..000000000 Binary files a/extlibs/libs-msvc-universal/ARM64/vorbisenc.lib and /dev/null differ diff --git a/extlibs/libs-msvc-universal/ARM64/vorbisfile.lib b/extlibs/libs-msvc-universal/ARM64/vorbisfile.lib deleted file mode 100644 index dba0d3255..000000000 Binary files a/extlibs/libs-msvc-universal/ARM64/vorbisfile.lib and /dev/null differ