diff options
Diffstat (limited to 'config/darwin-config.py')
-rw-r--r-- | config/darwin-config.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/config/darwin-config.py b/config/darwin-config.py index 3ef7b7132d9..4f002aecef7 100644 --- a/config/darwin-config.py +++ b/config/darwin-config.py @@ -40,18 +40,16 @@ 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' #BF_FFMPEG_LIB = 'avformat.a avcodec.a avutil.a' -WITH_BF_VERSE = False -BF_VERSE = "#extern/verse/dist" -BF_VERSE_LIBPATH = "${BF_BUILDDIR}/extern/verse/dist" -BF_VERSE_INCLUDE = BF_VERSE -BF_VERSE_LIBS = "libverse" - # python.org libs install in /library we want to use that for 2.5 # # if you want py2.5 on leopard without installing |