[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43255] trunk/blender: remove WITH_OGG define, its not used anywhere.
Campbell Barton
ideasman42 at gmail.com
Tue Jan 10 14:34:04 CET 2012
Revision: 43255
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43255
Author: campbellbarton
Date: 2012-01-10 13:33:53 +0000 (Tue, 10 Jan 2012)
Log Message:
-----------
remove WITH_OGG define, its not used anywhere.
Modified Paths:
--------------
trunk/blender/build_files/scons/config/freebsd7-config.py
trunk/blender/build_files/scons/config/freebsd8-config.py
trunk/blender/build_files/scons/config/freebsd9-config.py
trunk/blender/build_files/scons/config/linux-config.py
trunk/blender/build_files/scons/tools/btools.py
trunk/blender/source/blender/makesrna/SConscript
trunk/blender/source/blender/makesrna/intern/SConscript
Modified: trunk/blender/build_files/scons/config/freebsd7-config.py
===================================================================
--- trunk/blender/build_files/scons/config/freebsd7-config.py 2012-01-10 11:22:41 UTC (rev 43254)
+++ trunk/blender/build_files/scons/config/freebsd7-config.py 2012-01-10 13:33:53 UTC (rev 43255)
@@ -117,7 +117,7 @@
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'
Modified: trunk/blender/build_files/scons/config/freebsd8-config.py
===================================================================
--- trunk/blender/build_files/scons/config/freebsd8-config.py 2012-01-10 11:22:41 UTC (rev 43254)
+++ trunk/blender/build_files/scons/config/freebsd8-config.py 2012-01-10 13:33:53 UTC (rev 43255)
@@ -117,7 +117,7 @@
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'
Modified: trunk/blender/build_files/scons/config/freebsd9-config.py
===================================================================
--- trunk/blender/build_files/scons/config/freebsd9-config.py 2012-01-10 11:22:41 UTC (rev 43254)
+++ trunk/blender/build_files/scons/config/freebsd9-config.py 2012-01-10 13:33:53 UTC (rev 43255)
@@ -117,7 +117,7 @@
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'
Modified: trunk/blender/build_files/scons/config/linux-config.py
===================================================================
--- trunk/blender/build_files/scons/config/linux-config.py 2012-01-10 11:22:41 UTC (rev 43254)
+++ trunk/blender/build_files/scons/config/linux-config.py 2012-01-10 13:33:53 UTC (rev 43255)
@@ -140,7 +140,7 @@
#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'
Modified: trunk/blender/build_files/scons/tools/btools.py
===================================================================
--- trunk/blender/build_files/scons/tools/btools.py 2012-01-10 11:22:41 UTC (rev 43254)
+++ trunk/blender/build_files/scons/tools/btools.py 2012-01-10 13:33:53 UTC (rev 43255)
@@ -323,7 +323,7 @@
(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', ''),
Modified: trunk/blender/source/blender/makesrna/SConscript
===================================================================
--- trunk/blender/source/blender/makesrna/SConscript 2012-01-10 11:22:41 UTC (rev 43254)
+++ trunk/blender/source/blender/makesrna/SConscript 2012-01-10 13:33:53 UTC (rev 43255)
@@ -36,9 +36,6 @@
defs.append('WITH_FFMPEG')
incs += ' ' + env['BF_FFMPEG_INC']
-if env['WITH_BF_OGG']:
- defs.append('WITH_OGG')
-
if env['WITH_BF_QUICKTIME']:
defs.append('WITH_QUICKTIME')
incs += ' ../quicktime'
Modified: trunk/blender/source/blender/makesrna/intern/SConscript
===================================================================
--- trunk/blender/source/blender/makesrna/intern/SConscript 2012-01-10 11:22:41 UTC (rev 43254)
+++ trunk/blender/source/blender/makesrna/intern/SConscript 2012-01-10 13:33:53 UTC (rev 43255)
@@ -60,9 +60,6 @@
defs.append('WITH_FFMPEG')
incs += ' ' + env['BF_FFMPEG_INC']
-if env['WITH_BF_OGG']:
- defs.append('WITH_OGG')
-
if env['WITH_BF_QUICKTIME']:
defs.append('WITH_QUICKTIME')
incs += ' ../../quicktime'
More information about the Bf-blender-cvs
mailing list