pyrox.dev
1diff --git a/CMakeLists.txt b/CMakeLists.txt
2--- a/CMakeLists.txt
3+++ b/CMakeLists.txt
4@@ -1894,7 +1894,7 @@ if(WITH_COMPILER_SHORT_FILE_MACRO)
5 ADD_CHECK_CXX_COMPILER_FLAG(CXX_PREFIX_MAP_FLAGS CXX_MACRO_PREFIX_MAP -fmacro-prefix-map=foo=bar)
6 if(C_MACRO_PREFIX_MAP AND CXX_MACRO_PREFIX_MAP)
7 if(APPLE)
8- if(XCODE AND ${XCODE_VERSION} VERSION_LESS 12.0)
9+ if(FALSE)
10 # Developers may have say LLVM Clang-10.0.1 toolchain (which supports the flag)
11 # with Xcode-11 (the Clang of which doesn't support the flag).
12 message(WARNING
13diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake
14--- a/build_files/cmake/platform/platform_apple.cmake
15+++ b/build_files/cmake/platform/platform_apple.cmake
16@@ -60,7 +60,6 @@ else()
17 message(STATUS "Using pre-compiled LIBDIR: ${LIBDIR}")
18 endif()
19 if(NOT EXISTS "${LIBDIR}/")
20- message(FATAL_ERROR "Mac OSX requires pre-compiled libs at: '${LIBDIR}'")
21 endif()
22
23 # Prefer lib directory paths
24@@ -98,10 +97,6 @@ if(WITH_CODEC_SNDFILE)
25 find_library(_sndfile_VORBIS_LIBRARY NAMES vorbis HINTS ${LIBDIR}/ffmpeg/lib)
26 find_library(_sndfile_VORBISENC_LIBRARY NAMES vorbisenc HINTS ${LIBDIR}/ffmpeg/lib)
27 list(APPEND LIBSNDFILE_LIBRARIES
28- ${_sndfile_FLAC_LIBRARY}
29- ${_sndfile_OGG_LIBRARY}
30- ${_sndfile_VORBIS_LIBRARY}
31- ${_sndfile_VORBISENC_LIBRARY}
32 )
33
34 print_found_status("SndFile libraries" "${LIBSNDFILE_LIBRARIES}")
35@@ -118,7 +113,7 @@ if(WITH_PYTHON)
36 # Normally cached but not since we include them with blender.
37 set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}")
38 set(PYTHON_EXECUTABLE "${LIBDIR}/python/bin/python${PYTHON_VERSION}")
39- set(PYTHON_LIBRARY ${LIBDIR}/python/lib/libpython${PYTHON_VERSION}.a)
40+ set(PYTHON_LIBRARY ${LIBDIR}/python/lib/libpython${PYTHON_VERSION}.dylib)
41 set(PYTHON_LIBPATH "${LIBDIR}/python/lib/python${PYTHON_VERSION}")
42 else()
43 # Module must be compiled against Python framework.
44@@ -147,7 +142,7 @@ endif()
45
46 # FreeType compiled with Brotli compression for woff2.
47 find_package(Freetype REQUIRED)
48-list(APPEND FREETYPE_LIBRARIES
49+message(TRACE APPEND FREETYPE_LIBRARIES
50 ${LIBDIR}/brotli/lib/libbrotlicommon-static.a
51 ${LIBDIR}/brotli/lib/libbrotlidec-static.a)
52
53@@ -159,9 +154,7 @@ if(WITH_CODEC_FFMPEG)
54 set(FFMPEG_ROOT_DIR ${LIBDIR}/ffmpeg)
55 set(FFMPEG_FIND_COMPONENTS
56 avcodec avdevice avformat avutil
57- mp3lame ogg opus swresample swscale
58- theora theoradec theoraenc vorbis vorbisenc
59- vorbisfile vpx x264 xvidcore)
60+ swresample swscale)
61 if(EXISTS ${LIBDIR}/ffmpeg/lib/libaom.a)
62 list(APPEND FFMPEG_FIND_COMPONENTS aom)
63 endif()
64@@ -273,7 +266,6 @@ if(WITH_BOOST)
65 endif()
66
67 if(WITH_INTERNATIONAL OR WITH_CODEC_FFMPEG)
68- string(APPEND PLATFORM_LINKFLAGS " -liconv") # boost_locale and ffmpeg needs it !
69 endif()
70
71 if(WITH_PUGIXML)
72@@ -402,7 +394,7 @@ endif()
73
74 # CMake FindOpenMP doesn't know about AppleClang before 3.12, so provide custom flags.
75 if(WITH_OPENMP)
76- if(CMAKE_C_COMPILER_ID MATCHES "Clang")
77+ if(FALSE)
78 # Use OpenMP from our precompiled libraries.
79 message(STATUS "Using ${LIBDIR}/openmp for OpenMP")
80 set(OPENMP_CUSTOM ON)