--- a/CMakeLists.txt 2024-03-01 08:08:05 +++ b/CMakeLists.txt 2024-04-24 15:45:30 @@ -2134,7 +2134,7 @@ ) if(C_MACRO_PREFIX_MAP AND CXX_MACRO_PREFIX_MAP) if(APPLE) - if(XCODE AND ${XCODE_VERSION} VERSION_LESS 12.0) + if(FALSE) # Developers may have say LLVM Clang-10.0.1 toolchain (which supports the flag) # with Xcode-11 (the Clang of which doesn't support the flag). message( --- a/build_files/cmake/platform/platform_apple.cmake 2024-02-22 15:31:36 +++ b/build_files/cmake/platform/platform_apple.cmake 2024-04-24 16:06:13 @@ -55,7 +55,6 @@ endif() endif() if(NOT EXISTS "${LIBDIR}/.git") - message(FATAL_ERROR "Mac OSX requires pre-compiled libs at: '${LIBDIR}'") endif() if(FIRST_RUN) message(STATUS "Using pre-compiled LIBDIR: ${LIBDIR}") @@ -115,10 +114,6 @@ find_library(_sndfile_VORBIS_LIBRARY NAMES vorbis HINTS ${LIBDIR}/ffmpeg/lib) find_library(_sndfile_VORBISENC_LIBRARY NAMES vorbisenc HINTS ${LIBDIR}/ffmpeg/lib) list(APPEND LIBSNDFILE_LIBRARIES - ${_sndfile_FLAC_LIBRARY} - ${_sndfile_OGG_LIBRARY} - ${_sndfile_VORBIS_LIBRARY} - ${_sndfile_VORBISENC_LIBRARY} ) print_found_status("SndFile libraries" "${LIBSNDFILE_LIBRARIES}") @@ -162,9 +157,7 @@ set(FFMPEG_ROOT_DIR ${LIBDIR}/ffmpeg) set(FFMPEG_FIND_COMPONENTS avcodec avdevice avformat avutil - mp3lame ogg opus swresample swscale - theora theoradec theoraenc vorbis vorbisenc - vorbisfile vpx x264) + swresample swscale) if(EXISTS ${LIBDIR}/ffmpeg/lib/libaom.a) list(APPEND FFMPEG_FIND_COMPONENTS aom) endif() @@ -275,7 +268,6 @@ add_bundled_libraries(boost/lib) if(WITH_INTERNATIONAL OR WITH_CODEC_FFMPEG) - string(APPEND PLATFORM_LINKFLAGS " -liconv") # boost_locale and ffmpeg needs it ! endif() if(WITH_PUGIXML) @@ -350,7 +342,7 @@ # CMake FindOpenMP doesn't know about AppleClang before 3.12, so provide custom flags. if(WITH_OPENMP) - if(CMAKE_C_COMPILER_ID MATCHES "Clang") + if(FALSE) # Use OpenMP from our precompiled libraries. message(STATUS "Using ${LIBDIR}/openmp for OpenMP") set(OPENMP_CUSTOM ON) @@ -427,7 +419,7 @@ " -Wl,-unexported_symbols_list,'${PLATFORM_SYMBOLS_MAP}'" ) -if(${XCODE_VERSION} VERSION_GREATER_EQUAL 15.0) +if(FALSE) if("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64") # Silence "no platform load command found in , assuming: macOS". string(APPEND PLATFORM_LINKFLAGS " -Wl,-ld_classic")