diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-01-10 17:33:53 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-10 17:33:53 +0400 |
| commit | 8391f534abb3494bbc5bde813bc1d78d1dc48fb7 (patch) | |
| tree | 1f76ed1a09d9be8293a47e823c25381e623a72c5 /build_files | |
| parent | f85c1cda7495e0269bb6bd66fe50e2667c0d1782 (diff) | |
remove WITH_OGG define, its not used anywhere.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/scons/config/freebsd7-config.py | 2 | ||||
| -rw-r--r-- | build_files/scons/config/freebsd8-config.py | 2 | ||||
| -rw-r--r-- | build_files/scons/config/freebsd9-config.py | 2 | ||||
| -rw-r--r-- | build_files/scons/config/linux-config.py | 2 | ||||
| -rw-r--r-- | build_files/scons/tools/btools.py | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/build_files/scons/config/freebsd7-config.py b/build_files/scons/config/freebsd7-config.py index bf778061f0f..7826ca226f6 100644 --- a/build_files/scons/config/freebsd7-config.py +++ b/build_files/scons/config/freebsd7-config.py @@ -117,7 +117,7 @@ BF_FFMPEG_INC = '${BF_FFMPEG}/include' BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib' # enable ogg, vorbis and theora in ffmpeg -WITH_BF_OGG = True # -DWITH_OGG +WITH_BF_OGG = True BF_OGG = '/usr/local' BF_OGG_INC = '${BF_OGG}/include' BF_OGG_LIB = 'ogg vorbis vorbisenc theoraenc theoradec' diff --git a/build_files/scons/config/freebsd8-config.py b/build_files/scons/config/freebsd8-config.py index 738f14ab973..f2d5cf2d0ed 100644 --- a/build_files/scons/config/freebsd8-config.py +++ b/build_files/scons/config/freebsd8-config.py @@ -117,7 +117,7 @@ BF_FFMPEG_INC = '${BF_FFMPEG}/include' BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib' # enable ogg, vorbis and theora in ffmpeg -WITH_BF_OGG = True # -DWITH_OGG +WITH_BF_OGG = True BF_OGG = '/usr/local' BF_OGG_INC = '${BF_OGG}/include' BF_OGG_LIB = 'ogg vorbis vorbisenc theoraenc theoradec' diff --git a/build_files/scons/config/freebsd9-config.py b/build_files/scons/config/freebsd9-config.py index f40fc33646e..ea321b1a102 100644 --- a/build_files/scons/config/freebsd9-config.py +++ b/build_files/scons/config/freebsd9-config.py @@ -117,7 +117,7 @@ BF_FFMPEG_INC = '${BF_FFMPEG}/include' BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib' # enable ogg, vorbis and theora in ffmpeg -WITH_BF_OGG = True # -DWITH_OGG +WITH_BF_OGG = True BF_OGG = '/usr/local' BF_OGG_INC = '${BF_OGG}/include' BF_OGG_LIB = 'ogg vorbis vorbisenc theoraenc theoradec' diff --git a/build_files/scons/config/linux-config.py b/build_files/scons/config/linux-config.py index 6964ff993b6..fdef85655ec 100644 --- a/build_files/scons/config/linux-config.py +++ b/build_files/scons/config/linux-config.py @@ -140,7 +140,7 @@ BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib' #BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH/libavcodec.a ${BF_FFMPEG_LIBPATH}/libswscale.a ${BF_FFMPEG_LIBPATH}/libavutil.a ${BF_FFMPEG_LIBPATH}/libavdevice.a' # enable ogg, vorbis and theora in ffmpeg -WITH_BF_OGG = False # -DWITH_OGG +WITH_BF_OGG = False BF_OGG = '/usr' BF_OGG_INC = '${BF_OGG}/include' BF_OGG_LIB = 'ogg vorbis vorbisenc theoraenc theoradec' diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py index 9d47edcfd79..493bc7b8e02 100644 --- a/build_files/scons/tools/btools.py +++ b/build_files/scons/tools/btools.py @@ -323,7 +323,7 @@ def read_opts(env, cfg, args): (BoolVariable('WITH_BF_STATICFFMPEG', 'Use static FFMPEG if true', False)), ('BF_FFMPEG_LIB_STATIC', 'Static FFMPEG libraries', ''), - (BoolVariable('WITH_BF_OGG', 'Use OGG, THEORA, VORBIS in FFMPEG if true', + (BoolVariable('WITH_BF_OGG', 'Link OGG, THEORA, VORBIS with FFMPEG if true', False)), ('BF_OGG', 'OGG base path', ''), ('BF_OGG_LIB', 'OGG library', ''), |