@@ -1,15 +1,16 @@
1−diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake
1+diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake
2+index 31da529..90308aa 100644
23--- a/build_files/cmake/platform/platform_apple.cmake
34+++ b/build_files/cmake/platform/platform_apple.cmake
4−@@ -80,7 +80,6 @@ else()
5+@@ -77,7 +77,6 @@ else()
56 message(STATUS "Using pre-compiled LIBDIR: ${LIBDIR}")
67 endif()
78 if(NOT EXISTS "${LIBDIR}/")
89- message(FATAL_ERROR "Mac OSX requires pre-compiled libs at: '${LIBDIR}'")
910 endif()
1011
11− # -------------------------------------------------------------------------
12−@@ -112,10 +111,6 @@ if(WITH_CODEC_SNDFILE)
12+ # Prefer lib directory paths
13+@@ -113,10 +112,6 @@ if(WITH_CODEC_SNDFILE)
1314 find_library(_sndfile_VORBIS_LIBRARY NAMES vorbis HINTS ${LIBDIR}/ffmpeg/lib)
1415 find_library(_sndfile_VORBISENC_LIBRARY NAMES vorbisenc HINTS ${LIBDIR}/ffmpeg/lib)
1516 list(APPEND LIBSNDFILE_LIBRARIES
@@ -20,7 +21,7 @@ diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platf
2021 )
2122
2223 print_found_status("SndFile libraries" "${LIBSNDFILE_LIBRARIES}")
23−@@ -132,7 +127,7 @@ if(WITH_PYTHON)
24+@@ -133,7 +128,7 @@ if(WITH_PYTHON)
2425 # normally cached but not since we include them with blender
2526 set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}m")
2627 set(PYTHON_EXECUTABLE "${LIBDIR}/python/bin/python${PYTHON_VERSION}m")
@@ -29,7 +30,7 @@ diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platf
2930 set(PYTHON_LIBPATH "${LIBDIR}/python/lib/python${PYTHON_VERSION}")
3031 # set(PYTHON_LINKFLAGS "-u _PyMac_Error") # won't build with this enabled
3132 else()
32−@@ -173,9 +168,7 @@ endif()
33+@@ -174,9 +169,7 @@ endif()
3334 if(WITH_CODEC_FFMPEG)
3435 set(FFMPEG_FIND_COMPONENTS
3536 avcodec avdevice avformat avutil
@@ -40,20 +41,20 @@ diff a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platf
4041 find_package(FFmpeg)
4142 endif()
4243
43−@@ -266,7 +259,6 @@ if(WITH_BOOST)
44+@@ -267,7 +260,6 @@ if(WITH_BOOST)
4445 endif()
4546
4647 if(WITH_INTERNATIONAL OR WITH_CODEC_FFMPEG)
47−- set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -liconv") # boost_locale and ffmpeg needs it !
48+- string(APPEND PLATFORM_LINKFLAGS " -liconv") # boost_locale and ffmpeg needs it !
4849 endif()
4950
50− if(WITH_OPENIMAGEIO)
51−@@ -439,7 +431,7 @@ else()
51+ if(WITH_PUGIXML)
52+@@ -451,7 +443,7 @@ else()
5253 set(CMAKE_CXX_FLAGS_RELEASE "-O2 -mdynamic-no-pic")
5354 endif()
5455
5556-if(${XCODE_VERSION} VERSION_EQUAL 5 OR ${XCODE_VERSION} VERSION_GREATER 5)
5657+if(FALSE)
5758 # Xcode 5 is always using CLANG, which has too low template depth of 128 for libmv
58− set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftemplate-depth=1024")
59+ string(APPEND CMAKE_CXX_FLAGS " -ftemplate-depth=1024")
5960 endif()