Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'config/darwin-config.py')
-rw-r--r--config/darwin-config.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/config/darwin-config.py b/config/darwin-config.py
index 8719c5e7da0..4f002aecef7 100644
--- a/config/darwin-config.py
+++ b/config/darwin-config.py
@@ -40,7 +40,11 @@ else:
# enable ffmpeg support
WITH_BF_FFMPEG = True # -DWITH_FFMPEG
BF_FFMPEG = "#extern/ffmpeg"
-BF_FFMPEG_INC = '${BF_FFMPEG}/include'
+# trick : The version of ffmpeg in extern/ffmpeg uses explicit libav.. directory in #include statements
+# To keep Blender compatible with older versions, I add ${BF_FFMPEG} to the inc dir so that ffmpeg
+# finds the files directly in extern/ffmpeg/libav... while blender finds them in
+# extern/ffmpeg/include.
+BF_FFMPEG_INC = '${BF_FFMPEG}/include ${BF_FFMPEG}'
if USE_SDK==True:
BF_FFMPEG_EXTRA = '-isysroot '+MACOSX_SDK+' -mmacosx-version-min='+MAC_MIN_VERS
#BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'