diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-01-26 11:34:40 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-01-26 11:34:40 +0300 |
| commit | 87627374000b7de7445736a7239a3f2b168ce7eb (patch) | |
| tree | 2f0fe5d42d0938fc1b684af702d8613099bea1bd /config/darwin-config.py | |
| parent | 784d8ee37a52f3ef689aa6d02e75e50566efe93f (diff) | |
| parent | ba8ea9ec63c25b1ce134a846176f7bf252f4d487 (diff) | |
2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17853:HEAD
Diffstat (limited to 'config/darwin-config.py')
| -rw-r--r-- | config/darwin-config.py | 6 |
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' |