diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-04-20 19:06:46 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-04-20 19:06:46 +0400 |
commit | 874c29cea8e6f9bc411fccf2d6f4cb07e94328d0 (patch) | |
tree | 5971e577cf7c02e05a1e37b5ad058c71a6744877 /config | |
parent | 7555bfa793a2b0fc187c6211c56986f35b2d7b09 (diff) | |
parent | c5bc4e4fb1a33eda8c31f2ea02e91f32f74c8fa5 (diff) |
2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r19323:HEAD
Notes:
* blenderbuttons and ICON_SNAP_PEEL_OBJECT were not merged.
Diffstat (limited to 'config')
-rw-r--r-- | config/darwin-config.py | 9 | ||||
-rw-r--r-- | config/irix6-config.py | 5 | ||||
-rw-r--r-- | config/linux2-config.py | 12 | ||||
-rw-r--r-- | config/linuxcross-config.py | 3 | ||||
-rw-r--r-- | config/openbsd3-config.py | 3 | ||||
-rw-r--r-- | config/sunos5-config.py | 3 | ||||
-rw-r--r-- | config/win32-mingw-config.py | 3 | ||||
-rw-r--r-- | config/win32-vc-config.py | 5 |
8 files changed, 5 insertions, 38 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' diff --git a/config/irix6-config.py b/config/irix6-config.py index cb66dbafcce..711d16e623c 100644 --- a/config/irix6-config.py +++ b/config/irix6-config.py @@ -30,14 +30,11 @@ WITH_BF_STATICCXX = 'false' BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a' WITH_BF_SDL = 'true' -BF_SDL = LCGDIR+'/SDL' #$(shell sdl-config --prefix) +BF_SDL = LCGDIR+'/sdl' #$(shell sdl-config --prefix) BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags) BF_SDL_LIB = 'SDL audio iconv charset' #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 = 'false' WITH_BF_STATICOPENEXR = 'false' BF_OPENEXR = '/usr' diff --git a/config/linux2-config.py b/config/linux2-config.py index 45363f16cb0..d7c09258152 100644 --- a/config/linux2-config.py +++ b/config/linux2-config.py @@ -32,9 +32,6 @@ BF_SDL = '/usr' #$(shell sdl-config --prefix) BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags) BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer -WITH_BF_FMOD = False -BF_FMOD = LIBDIR + '/fmod' - WITH_BF_OPENEXR = True WITH_BF_STATICOPENEXR = False BF_OPENEXR = '/usr' @@ -138,19 +135,14 @@ BF_FFMPEG_LIB = '' # Uncomment the following two lines to use system's ffmpeg # BF_FFMPEG = '/usr' # BF_FFMPEG_LIB = 'avformat avcodec swscale avutil avdevice' -# trick : The version of ffmpeg in extern/ffmpeg uses explicit libav.. directory in #include statements -# To keep Blender compatible with older version, 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. When using system ffmpeg, you don't need that, assuming the system library -# still use the flat directory model, otherwise will not compile anyway -BF_FFMPEG_INC = '${BF_FFMPEG}/include ${BF_FFMPEG}' +BF_FFMPEG_INC = '${BF_FFMPEG}' BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib' # enable ogg, vorbis and theora in ffmpeg WITH_BF_OGG = False # -DWITH_OGG BF_OGG = '/usr' BF_OGG_INC = '${BF_OGG}/include' -BF_OGG_LIB = 'ogg vorbis theoraenc theoradec' +BF_OGG_LIB = 'ogg vorbis vorbisenc theoraenc theoradec' WITH_BF_OPENJPEG = True BF_OPENJPEG = '#extern/libopenjpeg' diff --git a/config/linuxcross-config.py b/config/linuxcross-config.py index 8c643b75d63..4214ca52aac 100644 --- a/config/linuxcross-config.py +++ b/config/linuxcross-config.py @@ -35,9 +35,6 @@ BF_PTHREADS_INC = '${BF_PTHREADS}/include' BF_PTHREADS_LIB = 'pthreadGC2' BF_PTHREADS_LIBPATH = '${BF_PTHREADS}/lib' -WITH_BF_FMOD = False -BF_FMOD = LIBDIR + '/fmod' - WITH_BF_OPENEXR = True WITH_BF_STATICOPENEXR = False BF_OPENEXR = LIBDIR + '/gcc/openexr' diff --git a/config/openbsd3-config.py b/config/openbsd3-config.py index 8fc334874f9..3a36f8df663 100644 --- a/config/openbsd3-config.py +++ b/config/openbsd3-config.py @@ -22,9 +22,6 @@ BF_SDL_INC = '${BF_SDL}/include/SDL' #$(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 = False WITH_BF_STATICOPENEXR = False BF_OPENEXR = '/usr/local' diff --git a/config/sunos5-config.py b/config/sunos5-config.py index dda7d0ff2f3..6fa9529e1cd 100644 --- a/config/sunos5-config.py +++ b/config/sunos5-config.py @@ -28,9 +28,6 @@ BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags) BF_SDL_LIBPATH = '${BF_SDL}/lib' BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer -WITH_BF_FMOD = False -BF_FMOD = LIBDIR + '/fmod' - WITH_BF_OPENEXR = True WITH_BF_STATICOPENEXR = False BF_OPENEXR = '/usr/local' diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py index 0ad93c3d38c..80082002b21 100644 --- a/config/win32-mingw-config.py +++ b/config/win32-mingw-config.py @@ -35,9 +35,6 @@ BF_PTHREADS_INC = '${BF_PTHREADS}/include' BF_PTHREADS_LIB = 'pthreadGC2' BF_PTHREADS_LIBPATH = '${BF_PTHREADS}/lib' -WITH_BF_FMOD = False -BF_FMOD = LIBDIR + '/fmod' - WITH_BF_OPENEXR = True WITH_BF_STATICOPENEXR = False BF_OPENEXR = LIBDIR + '/gcc/openexr' diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index 685c8dc860f..b5ad19890e1 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-config.py @@ -6,7 +6,7 @@ WITH_BF_FFMPEG = True # -DWITH_FFMPEG BF_FFMPEG = LIBDIR +'/ffmpeg' BF_FFMPEG_INC = '${BF_FFMPEG}/include' BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib' -BF_FFMPEG_LIB = 'avformat-52.lib avcodec-51.lib avdevice-52.lib avutil-49.lib swscale-0.lib' +BF_FFMPEG_LIB = 'avformat-52.lib avcodec-52.lib avdevice-52.lib avutil-50.lib swscale-0.lib' BF_PYTHON = LIBDIR + '/python' BF_PYTHON_VERSION = '2.5' @@ -46,9 +46,6 @@ BF_PTHREADS_INC = '${BF_PTHREADS}/include' BF_PTHREADS_LIB = 'pthreadVC2' BF_PTHREADS_LIBPATH = '${BF_PTHREADS}/lib' -WITH_BF_FMOD = False -BF_FMOD = LIBDIR + '/fmod' - WITH_BF_OPENEXR = True WITH_BF_STATICOPENEXR = False BF_OPENEXR = LIBDIR + '/openexr' |