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.py9
1 files changed, 1 insertions, 8 deletions
diff --git a/config/darwin-config.py b/config/darwin-config.py
index 4f002aecef7..8ac83ce4a0d 100644
--- a/config/darwin-config.py
+++ b/config/darwin-config.py
@@ -40,11 +40,7 @@ else:
# enable ffmpeg support
WITH_BF_FFMPEG = True # -DWITH_FFMPEG
BF_FFMPEG = "#extern/ffmpeg"
-# 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}'
+BF_FFMPEG_INC = '${BF_FFMPEG}'
if USE_SDK==True:
BF_FFMPEG_EXTRA = '-isysroot '+MACOSX_SDK+' -mmacosx-version-min='+MAC_MIN_VERS
#BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
@@ -104,9 +100,6 @@ BF_SDL_INC = '${BF_SDL}/include' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
BF_SDL_LIBPATH = '${BF_SDL}/lib'
-WITH_BF_FMOD = False
-BF_FMOD = LIBDIR + '/fmod'
-
WITH_BF_OPENEXR = True
WITH_BF_STATICOPENEXR = False
BF_OPENEXR = '${LCGDIR}/openexr'