[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17301] branches/etch-a-ton: merging trunk 17221:17300
Martin Poirier
theeth at yahoo.com
Sun Nov 2 20:44:24 CET 2008
Revision: 17301
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17301
Author: theeth
Date: 2008-11-02 20:44:18 +0100 (Sun, 02 Nov 2008)
Log Message:
-----------
merging trunk 17221:17300
Modified Paths:
--------------
branches/etch-a-ton/CMakeLists.txt
branches/etch-a-ton/SConstruct
branches/etch-a-ton/config/darwin-config.py
branches/etch-a-ton/config/linux2-config.py
branches/etch-a-ton/config/openbsd3-config.py
branches/etch-a-ton/config/sunos5-config.py
branches/etch-a-ton/config/win32-mingw-config.py
branches/etch-a-ton/config/win32-vc-config.py
branches/etch-a-ton/doc/blender-scons.txt
branches/etch-a-ton/extern/ffmpeg/Makefile
branches/etch-a-ton/extern/ffmpeg/SConscript
branches/etch-a-ton/extern/verse/dist/SConstruct
branches/etch-a-ton/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/etch-a-ton/projectfiles_vc7/blender/blender.sln
branches/etch-a-ton/projectfiles_vc7/blender/blender.vcproj
branches/etch-a-ton/projectfiles_vc7/blender/blenlib/BLI_blenlib.vcproj
branches/etch-a-ton/projectfiles_vc7/blender/src/BL_src.vcproj
branches/etch-a-ton/source/Makefile
branches/etch-a-ton/source/blender/blenkernel/BKE_fluidsim.h
branches/etch-a-ton/source/blender/blenkernel/BKE_writeffmpeg.h
branches/etch-a-ton/source/blender/blenkernel/intern/CCGSubSurf.c
branches/etch-a-ton/source/blender/blenkernel/intern/curve.c
branches/etch-a-ton/source/blender/blenkernel/intern/depsgraph.c
branches/etch-a-ton/source/blender/blenkernel/intern/fluidsim.c
branches/etch-a-ton/source/blender/blenkernel/intern/object.c
branches/etch-a-ton/source/blender/blenkernel/intern/writeffmpeg.c
branches/etch-a-ton/source/blender/blenloader/intern/readblenentry.c
branches/etch-a-ton/source/blender/blenloader/intern/readfile.c
branches/etch-a-ton/source/blender/blenloader/intern/readfile.h
branches/etch-a-ton/source/blender/imbuf/intern/util.c
branches/etch-a-ton/source/blender/makesdna/intern/SConscript
branches/etch-a-ton/source/blender/python/api2_2x/Armature.c
branches/etch-a-ton/source/blender/python/api2_2x/doc/SConscript
branches/etch-a-ton/source/blender/python/api2_2x/matrix.c
branches/etch-a-ton/source/blender/render/intern/source/convertblender.c
branches/etch-a-ton/source/blender/render/intern/source/envmap.c
branches/etch-a-ton/source/blender/render/intern/source/sss.c
branches/etch-a-ton/source/blender/src/buttons_editing.c
branches/etch-a-ton/source/blender/src/buttons_logic.c
branches/etch-a-ton/source/blender/src/interface.c
branches/etch-a-ton/source/creator/CMakeLists.txt
branches/etch-a-ton/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/etch-a-ton/source/gameengine/CMakeLists.txt
branches/etch-a-ton/source/gameengine/Ketsji/BL_Texture.h
branches/etch-a-ton/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/etch-a-ton/source/gameengine/Ketsji/KX_Camera.cpp
branches/etch-a-ton/source/gameengine/Ketsji/KX_GameObject.cpp
branches/etch-a-ton/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/etch-a-ton/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/etch-a-ton/source/gameengine/Ketsji/KX_ParentActuator.cpp
branches/etch-a-ton/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/etch-a-ton/source/gameengine/Ketsji/KX_PythonInit.h
branches/etch-a-ton/source/gameengine/Makefile
branches/etch-a-ton/source/gameengine/Physics/Sumo/SConscript
branches/etch-a-ton/source/gameengine/PyDoc/SConscript
branches/etch-a-ton/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
branches/etch-a-ton/source/gameengine/Rasterizer/RAS_2DFilterManager.h
branches/etch-a-ton/source/gameengine/SConscript
branches/etch-a-ton/source/nan_compile.mk
branches/etch-a-ton/tools/Blender.py
branches/etch-a-ton/tools/btools.py
Added Paths:
-----------
branches/etch-a-ton/extern/ffmpeg/libavdevice/
branches/etch-a-ton/extern/ffmpeg/libavdevice/Makefile
branches/etch-a-ton/extern/ffmpeg/libavdevice/alldevices.c
branches/etch-a-ton/extern/ffmpeg/libavdevice/audio.c
branches/etch-a-ton/extern/ffmpeg/libavdevice/avdevice.h
branches/etch-a-ton/extern/ffmpeg/libavdevice/beosaudio.cpp
branches/etch-a-ton/extern/ffmpeg/libavdevice/bktr.c
branches/etch-a-ton/extern/ffmpeg/libavdevice/dv1394.c
branches/etch-a-ton/extern/ffmpeg/libavdevice/dv1394.h
branches/etch-a-ton/extern/ffmpeg/libavdevice/libdc1394.c
branches/etch-a-ton/extern/ffmpeg/libavdevice/v4l.c
branches/etch-a-ton/extern/ffmpeg/libavdevice/v4l2.c
branches/etch-a-ton/extern/ffmpeg/libavdevice/x11grab.c
branches/etch-a-ton/scons/
branches/etch-a-ton/scons/scons-LICENSE
branches/etch-a-ton/scons/scons-README
branches/etch-a-ton/scons/scons-local-1.1.0/
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Action.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Builder.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/CacheDir.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Conftest.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Debug.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Defaults.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Environment.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Errors.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Executor.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Job.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Memoize.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Node/
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Node/Alias.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Node/FS.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Node/Python.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Node/__init__.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Options/
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Options/BoolOption.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Options/EnumOption.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Options/ListOption.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Options/PackageOption.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Options/PathOption.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Options/__init__.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/PathList.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Platform/
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Platform/__init__.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Platform/aix.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Platform/cygwin.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Platform/darwin.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Platform/hpux.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Platform/irix.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Platform/os2.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Platform/posix.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Platform/sunos.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Platform/win32.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/SConf.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/SConsign.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Scanner/
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Scanner/C.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Scanner/D.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Scanner/Dir.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Scanner/Fortran.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Scanner/IDL.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Scanner/LaTeX.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Scanner/Prog.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Scanner/RC.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Scanner/__init__.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Script/
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Script/Interactive.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Script/Main.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Script/SConsOptions.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Script/SConscript.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Script/__init__.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Sig.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Subst.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Taskmaster.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/386asm.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/BitKeeper.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/CVS.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/FortranCommon.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/JavaCommon.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/Perforce.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/PharLapCommon.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/RCS.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/SCCS.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/Subversion.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/__init__.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/aixc++.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/aixcc.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/aixf77.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/aixlink.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/applelink.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/ar.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/as.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/bcc32.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/c++.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/cc.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/cvf.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/default.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/dmd.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/dvi.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/dvipdf.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/dvips.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/f77.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/f90.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/f95.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/filesystem.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/fortran.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/g++.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/g77.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/gas.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/gcc.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/gfortran.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/gnulink.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/gs.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/hpc++.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/hpcc.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/hplink.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/icc.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/icl.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/ifl.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/ifort.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/ilink.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/ilink32.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/install.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/intelc.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/jar.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/javac.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/javah.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/latex.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/lex.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/link.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/linkloc.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/m4.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/masm.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/midl.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/mingw.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/mslib.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/mslink.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/msvc.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/msvs.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/mwcc.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/mwld.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/nasm.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/packaging/
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/packaging/__init__.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/packaging/ipk.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/packaging/msi.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/packaging/rpm.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/packaging/src_tarbz2.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/packaging/src_targz.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/packaging/src_zip.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/packaging/tarbz2.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/packaging/targz.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/packaging/zip.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/pdf.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/pdflatex.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/pdftex.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/qt.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/rmic.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/rpcgen.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/rpm.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/sgiar.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/sgic++.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/sgicc.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/sgilink.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/sunar.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/sunc++.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/suncc.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/sunf77.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/sunf90.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/sunf95.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/sunlink.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/swig.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/tar.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/tex.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/tlib.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/wix.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/yacc.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/zip.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Util.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Variables/
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Variables/BoolVariable.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Variables/EnumVariable.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Variables/ListVariable.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Variables/PackageVariable.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Variables/PathVariable.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Variables/__init__.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Warnings.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/__init__.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/compat/
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/compat/__init__.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/compat/_scons_UserString.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/compat/_scons_hashlib.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/compat/_scons_itertools.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/compat/_scons_optparse.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/compat/_scons_sets.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/compat/_scons_sets15.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/compat/_scons_shlex.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/compat/_scons_subprocess.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/compat/_scons_textwrap.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/compat/builtins.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/cpp.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/dblite.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/exitfuncs.py
branches/etch-a-ton/scons/scons-time.py
branches/etch-a-ton/scons/scons.py
branches/etch-a-ton/scons/sconsign.py
branches/etch-a-ton/source/gameengine/VideoTexture/
branches/etch-a-ton/source/gameengine/VideoTexture/BlendType.h
branches/etch-a-ton/source/gameengine/VideoTexture/CMakeLists.txt
branches/etch-a-ton/source/gameengine/VideoTexture/Common.h
branches/etch-a-ton/source/gameengine/VideoTexture/Exception.cpp
branches/etch-a-ton/source/gameengine/VideoTexture/Exception.h
branches/etch-a-ton/source/gameengine/VideoTexture/FilterBase.cpp
branches/etch-a-ton/source/gameengine/VideoTexture/FilterBase.h
branches/etch-a-ton/source/gameengine/VideoTexture/FilterBlueScreen.cpp
branches/etch-a-ton/source/gameengine/VideoTexture/FilterBlueScreen.h
branches/etch-a-ton/source/gameengine/VideoTexture/FilterColor.cpp
branches/etch-a-ton/source/gameengine/VideoTexture/FilterColor.h
branches/etch-a-ton/source/gameengine/VideoTexture/FilterNormal.cpp
branches/etch-a-ton/source/gameengine/VideoTexture/FilterNormal.h
branches/etch-a-ton/source/gameengine/VideoTexture/FilterSource.cpp
branches/etch-a-ton/source/gameengine/VideoTexture/FilterSource.h
branches/etch-a-ton/source/gameengine/VideoTexture/ImageBase.cpp
branches/etch-a-ton/source/gameengine/VideoTexture/ImageBase.h
branches/etch-a-ton/source/gameengine/VideoTexture/ImageBuff.cpp
branches/etch-a-ton/source/gameengine/VideoTexture/ImageBuff.h
branches/etch-a-ton/source/gameengine/VideoTexture/ImageMix.cpp
branches/etch-a-ton/source/gameengine/VideoTexture/ImageMix.h
branches/etch-a-ton/source/gameengine/VideoTexture/ImageRender.cpp
branches/etch-a-ton/source/gameengine/VideoTexture/ImageRender.h
branches/etch-a-ton/source/gameengine/VideoTexture/ImageViewport.cpp
branches/etch-a-ton/source/gameengine/VideoTexture/ImageViewport.h
branches/etch-a-ton/source/gameengine/VideoTexture/Makefile
branches/etch-a-ton/source/gameengine/VideoTexture/PyTypeList.cpp
branches/etch-a-ton/source/gameengine/VideoTexture/PyTypeList.h
branches/etch-a-ton/source/gameengine/VideoTexture/SConscript
branches/etch-a-ton/source/gameengine/VideoTexture/Texture.cpp
branches/etch-a-ton/source/gameengine/VideoTexture/Texture.h
branches/etch-a-ton/source/gameengine/VideoTexture/VideoBase.cpp
branches/etch-a-ton/source/gameengine/VideoTexture/VideoBase.h
branches/etch-a-ton/source/gameengine/VideoTexture/VideoFFmpeg.cpp
branches/etch-a-ton/source/gameengine/VideoTexture/VideoFFmpeg.h
branches/etch-a-ton/source/gameengine/VideoTexture/blendVideoTex.cpp
Removed Paths:
-------------
branches/etch-a-ton/extern/ffmpeg/libavdevice/Makefile
branches/etch-a-ton/extern/ffmpeg/libavdevice/alldevices.c
branches/etch-a-ton/extern/ffmpeg/libavdevice/audio.c
branches/etch-a-ton/extern/ffmpeg/libavdevice/avdevice.h
branches/etch-a-ton/extern/ffmpeg/libavdevice/beosaudio.cpp
branches/etch-a-ton/extern/ffmpeg/libavdevice/bktr.c
branches/etch-a-ton/extern/ffmpeg/libavdevice/dv1394.c
branches/etch-a-ton/extern/ffmpeg/libavdevice/dv1394.h
branches/etch-a-ton/extern/ffmpeg/libavdevice/libdc1394.c
branches/etch-a-ton/extern/ffmpeg/libavdevice/v4l.c
branches/etch-a-ton/extern/ffmpeg/libavdevice/v4l2.c
branches/etch-a-ton/extern/ffmpeg/libavdevice/x11grab.c
branches/etch-a-ton/scons/scons-LICENSE
branches/etch-a-ton/scons/scons-README
branches/etch-a-ton/scons/scons-local-1.1.0/
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Action.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Builder.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/CacheDir.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Conftest.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Debug.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Defaults.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Environment.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Errors.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Executor.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Job.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Memoize.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Node/
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Node/Alias.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Node/FS.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Node/Python.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Node/__init__.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Options/
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Options/BoolOption.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Options/EnumOption.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Options/ListOption.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Options/PackageOption.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Options/PathOption.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Options/__init__.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/PathList.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Platform/
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Platform/__init__.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Platform/aix.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Platform/cygwin.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Platform/darwin.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Platform/hpux.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Platform/irix.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Platform/os2.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Platform/posix.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Platform/sunos.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Platform/win32.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/SConf.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/SConsign.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Scanner/
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Scanner/C.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Scanner/D.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Scanner/Dir.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Scanner/Fortran.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Scanner/IDL.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Scanner/LaTeX.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Scanner/Prog.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Scanner/RC.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Scanner/__init__.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Script/
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Script/Interactive.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Script/Main.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Script/SConsOptions.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Script/SConscript.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Script/__init__.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Sig.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Subst.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Taskmaster.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/386asm.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/BitKeeper.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/CVS.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/FortranCommon.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/JavaCommon.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/Perforce.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/PharLapCommon.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/RCS.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/SCCS.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/Subversion.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/__init__.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/aixc++.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/aixcc.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/aixf77.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/aixlink.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/applelink.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/ar.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/as.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/bcc32.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/c++.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/cc.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/cvf.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/default.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/dmd.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/dvi.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/dvipdf.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/dvips.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/f77.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/f90.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/f95.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/filesystem.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/fortran.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/g++.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/g77.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/gas.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/gcc.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/gfortran.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/gnulink.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/gs.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/hpc++.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/hpcc.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/hplink.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/icc.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/icl.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/ifl.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/ifort.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/ilink.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/ilink32.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/install.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/intelc.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/jar.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/javac.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/javah.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/latex.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/lex.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/link.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/linkloc.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/m4.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/masm.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/midl.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/mingw.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/mslib.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/mslink.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/msvc.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/msvs.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/mwcc.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/mwld.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/nasm.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/packaging/
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/packaging/__init__.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/packaging/ipk.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/packaging/msi.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/packaging/rpm.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/packaging/src_tarbz2.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/packaging/src_targz.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/packaging/src_zip.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/packaging/tarbz2.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/packaging/targz.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/packaging/zip.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/pdf.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/pdflatex.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/pdftex.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/qt.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/rmic.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/rpcgen.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/rpm.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/sgiar.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/sgic++.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/sgicc.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/sgilink.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/sunar.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/sunc++.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/suncc.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/sunf77.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/sunf90.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/sunf95.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/sunlink.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/swig.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/tar.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/tex.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/tlib.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/wix.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/yacc.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Tool/zip.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Util.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Variables/
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Variables/BoolVariable.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Variables/EnumVariable.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Variables/ListVariable.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Variables/PackageVariable.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Variables/PathVariable.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Variables/__init__.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/Warnings.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/__init__.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/compat/
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/compat/__init__.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/compat/_scons_UserString.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/compat/_scons_hashlib.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/compat/_scons_itertools.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/compat/_scons_optparse.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/compat/_scons_sets.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/compat/_scons_sets15.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/compat/_scons_shlex.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/compat/_scons_subprocess.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/compat/_scons_textwrap.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/compat/builtins.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/cpp.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/dblite.py
branches/etch-a-ton/scons/scons-local-1.1.0/SCons/exitfuncs.py
branches/etch-a-ton/scons/scons-time.py
branches/etch-a-ton/scons/scons.py
branches/etch-a-ton/scons/sconsign.py
branches/etch-a-ton/source/gameengine/VideoTexture/BlendType.h
branches/etch-a-ton/source/gameengine/VideoTexture/CMakeLists.txt
branches/etch-a-ton/source/gameengine/VideoTexture/Common.h
branches/etch-a-ton/source/gameengine/VideoTexture/Exception.cpp
branches/etch-a-ton/source/gameengine/VideoTexture/Exception.h
branches/etch-a-ton/source/gameengine/VideoTexture/FilterBase.cpp
branches/etch-a-ton/source/gameengine/VideoTexture/FilterBase.h
branches/etch-a-ton/source/gameengine/VideoTexture/FilterBlueScreen.cpp
branches/etch-a-ton/source/gameengine/VideoTexture/FilterBlueScreen.h
branches/etch-a-ton/source/gameengine/VideoTexture/FilterColor.cpp
branches/etch-a-ton/source/gameengine/VideoTexture/FilterColor.h
branches/etch-a-ton/source/gameengine/VideoTexture/FilterNormal.cpp
branches/etch-a-ton/source/gameengine/VideoTexture/FilterNormal.h
branches/etch-a-ton/source/gameengine/VideoTexture/FilterSource.cpp
branches/etch-a-ton/source/gameengine/VideoTexture/FilterSource.h
branches/etch-a-ton/source/gameengine/VideoTexture/ImageBase.cpp
branches/etch-a-ton/source/gameengine/VideoTexture/ImageBase.h
branches/etch-a-ton/source/gameengine/VideoTexture/ImageBuff.cpp
branches/etch-a-ton/source/gameengine/VideoTexture/ImageBuff.h
branches/etch-a-ton/source/gameengine/VideoTexture/ImageMix.cpp
branches/etch-a-ton/source/gameengine/VideoTexture/ImageMix.h
branches/etch-a-ton/source/gameengine/VideoTexture/ImageRender.cpp
branches/etch-a-ton/source/gameengine/VideoTexture/ImageRender.h
branches/etch-a-ton/source/gameengine/VideoTexture/ImageViewport.cpp
branches/etch-a-ton/source/gameengine/VideoTexture/ImageViewport.h
branches/etch-a-ton/source/gameengine/VideoTexture/Makefile
branches/etch-a-ton/source/gameengine/VideoTexture/PyTypeList.cpp
branches/etch-a-ton/source/gameengine/VideoTexture/PyTypeList.h
branches/etch-a-ton/source/gameengine/VideoTexture/SConscript
branches/etch-a-ton/source/gameengine/VideoTexture/Texture.cpp
branches/etch-a-ton/source/gameengine/VideoTexture/Texture.h
branches/etch-a-ton/source/gameengine/VideoTexture/VideoBase.cpp
branches/etch-a-ton/source/gameengine/VideoTexture/VideoBase.h
branches/etch-a-ton/source/gameengine/VideoTexture/VideoFFmpeg.cpp
branches/etch-a-ton/source/gameengine/VideoTexture/VideoFFmpeg.h
branches/etch-a-ton/source/gameengine/VideoTexture/blendVideoTex.cpp
Modified: branches/etch-a-ton/CMakeLists.txt
===================================================================
--- branches/etch-a-ton/CMakeLists.txt 2008-11-02 18:41:24 UTC (rev 17300)
+++ branches/etch-a-ton/CMakeLists.txt 2008-11-02 19:44:18 UTC (rev 17301)
@@ -88,14 +88,16 @@
#Platform specifics
IF(UNIX)
- INCLUDE(${CMAKE_ROOT}/Modules/FindOpenAL.cmake)
- IF(OPENAL_FOUND)
- SET(WITH_OPENAL ON)
- SET(OPENAL_LIB ${OPENAL_LIBRARY})
- SET(OPENAL_INC ${OPENAL_INCLUDE_DIR})
- ELSE(OPENAL_FOUND)
- SET(WITH_OPENAL OFF)
- ENDIF(OPENAL_FOUND)
+ IF(WITH_OPENAL)
+ INCLUDE(${CMAKE_ROOT}/Modules/FindOpenAL.cmake)
+ IF(OPENAL_FOUND)
+ SET(WITH_OPENAL ON)
+ SET(OPENAL_LIB ${OPENAL_LIBRARY})
+ SET(OPENAL_INC ${OPENAL_INCLUDE_DIR})
+ ELSE(OPENAL_FOUND)
+ SET(WITH_OPENAL OFF)
+ ENDIF(OPENAL_FOUND)
+ ENDIF(WITH_OPENAL)
FIND_LIBRARY(ALUT_LIBRARY
NAMES alut
Modified: branches/etch-a-ton/SConstruct
===================================================================
--- branches/etch-a-ton/SConstruct 2008-11-02 18:41:24 UTC (rev 17300)
+++ branches/etch-a-ton/SConstruct 2008-11-02 19:44:18 UTC (rev 17301)
@@ -42,6 +42,8 @@
import tools.btools
import tools.bcolors
+EnsureSConsVersion(1,0,0)
+
BlenderEnvironment = tools.Blender.BlenderEnvironment
btools = tools.btools
B = tools.Blender
@@ -172,6 +174,9 @@
if not env['BF_FANCY']:
B.bc.disable()
+SetOption('num_jobs', int(env['BF_NUMJOBS']))
+print "Build with %d parallel jobs" % (GetOption('num_jobs'))
+
# disable elbeem (fluidsim) compilation?
if env['BF_NO_ELBEEM'] == 1:
env['CPPFLAGS'].append('-DDISABLE_ELBEEM')
Modified: branches/etch-a-ton/config/darwin-config.py
===================================================================
--- branches/etch-a-ton/config/darwin-config.py 2008-11-02 18:41:24 UTC (rev 17300)
+++ branches/etch-a-ton/config/darwin-config.py 2008-11-02 19:44:18 UTC (rev 17301)
@@ -251,9 +251,9 @@
##
CC = 'gcc'
CXX = 'g++'
-C_WARN = ' -Wall -Wno-long-double -Wdeclaration-after-statement '
+C_WARN = ['-Wdeclaration-after-statement']
-CC_WARN = ' -Wall -Wno-long-double'
+CC_WARN = ['-Wall', '-Wno-long-double']
##FIX_STUBS_WARNINGS = -Wno-unused
Modified: branches/etch-a-ton/config/linux2-config.py
===================================================================
--- branches/etch-a-ton/config/linux2-config.py 2008-11-02 18:41:24 UTC (rev 17300)
+++ branches/etch-a-ton/config/linux2-config.py 2008-11-02 19:44:18 UTC (rev 17301)
@@ -187,9 +187,9 @@
##ARFLAGS = ruv
##ARFLAGSQUIET = ru
##
-C_WARN = '-Wall -Wno-char-subscripts -Wdeclaration-after-statement'
+C_WARN = ['-Wno-char-subscripts', '-Wdeclaration-after-statement']
-CC_WARN = '-Wall'
+CC_WARN = ['-Wall']
##FIX_STUBS_WARNINGS = -Wno-unused
Modified: branches/etch-a-ton/config/openbsd3-config.py
===================================================================
--- branches/etch-a-ton/config/openbsd3-config.py 2008-11-02 18:41:24 UTC (rev 17300)
+++ branches/etch-a-ton/config/openbsd3-config.py 2008-11-02 19:44:18 UTC (rev 17301)
@@ -145,9 +145,9 @@
##
CC = 'gcc'
CXX = 'g++'
-C_WARN = '-Wall -Wdeclaration-after-statement'
+C_WARN = ['-Wdeclaration-after-statement']
-CC_WARN = '-Wall'
+CC_WARN = ['-Wall']
##FIX_STUBS_WARNINGS = -Wno-unused
Modified: branches/etch-a-ton/config/sunos5-config.py
===================================================================
--- branches/etch-a-ton/config/sunos5-config.py 2008-11-02 18:41:24 UTC (rev 17300)
+++ branches/etch-a-ton/config/sunos5-config.py 2008-11-02 19:44:18 UTC (rev 17301)
@@ -159,9 +159,9 @@
##ARFLAGS = ruv
##ARFLAGSQUIET = ru
##
-C_WARN = '-Wall -Wno-char-subscripts -Wdeclaration-after-statement'
+C_WARN = ['-Wno-char-subscripts', '-Wdeclaration-after-statement']
-CC_WARN = '-Wall'
+CC_WARN = ['-Wall']
##FIX_STUBS_WARNINGS = -Wno-unused
Modified: branches/etch-a-ton/config/win32-mingw-config.py
===================================================================
--- branches/etch-a-ton/config/win32-mingw-config.py 2008-11-02 18:41:24 UTC (rev 17300)
+++ branches/etch-a-ton/config/win32-mingw-config.py 2008-11-02 19:44:18 UTC (rev 17301)
@@ -153,7 +153,7 @@
REL_CFLAGS = [ '-O2' ]
REL_CCFLAGS = [ '-O2' ]
-C_WARN = [ '-Wall' , '-Wno-char-subscripts', '-Wdeclaration-after-statement' ]
+C_WARN = [ '-Wno-char-subscripts', '-Wdeclaration-after-statement' ]
CC_WARN = [ '-Wall' ]
Modified: branches/etch-a-ton/config/win32-vc-config.py
===================================================================
--- branches/etch-a-ton/config/win32-vc-config.py 2008-11-02 18:41:24 UTC (rev 17300)
+++ branches/etch-a-ton/config/win32-vc-config.py 2008-11-02 19:44:18 UTC (rev 17301)
@@ -161,14 +161,18 @@
CXX = 'cl.exe'
CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/MT']
+CXXFLAGS = ['/EHsc']
-BF_DEBUG_FLAGS = ['/Zi', '/FR${TARGET}.sbr']
+BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr']
CPPFLAGS = ['-DWIN32','-D_CONSOLE', '-D_LIB', '-DFTGL_LIBRARY_STATIC', '-D_CRT_SECURE_NO_DEPRECATE']
REL_CFLAGS = ['-O2', '-DNDEBUG']
REL_CCFLAGS = ['-O2', '-DNDEBUG']
+REL_CXXFLAGS = ['-O2', '-DNDEBUG']
+
C_WARN = []
CC_WARN = []
+CXX_WARN = []
LLIBS = 'ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid'
Modified: branches/etch-a-ton/doc/blender-scons.txt
===================================================================
--- branches/etch-a-ton/doc/blender-scons.txt 2008-11-02 18:41:24 UTC (rev 17300)
+++ branches/etch-a-ton/doc/blender-scons.txt 2008-11-02 19:44:18 UTC (rev 17301)
@@ -1,9 +1,5 @@
$Id$
- Note: The current official release of SCons is 0.98, but
- our system still works for 0.97. However, this will be fixed
- soon.
-
Blenders SCons build scripts
============================
@@ -31,7 +27,7 @@
To build Blender with the SCons scripts you need a full Python
install, version 2.4 or later (http://www.python.org) and a SCons
- installation, version v0.97 (http://www.scons.org).
+ installation, version v1.1.0 (http://www.scons.org).
Check from the page
http://www.blender.org/development/building-blender/getting-dependencies/
Modified: branches/etch-a-ton/extern/ffmpeg/Makefile
===================================================================
--- branches/etch-a-ton/extern/ffmpeg/Makefile 2008-11-02 18:41:24 UTC (rev 17300)
+++ branches/etch-a-ton/extern/ffmpeg/Makefile 2008-11-02 19:44:18 UTC (rev 17301)
@@ -35,7 +35,7 @@
ALLDIRS = libavcodec libavformat libavutil libswscale
config::
- ./configure --disable-shared --enable-liba52bin --enable-gpl --disable-network --disable-zlib --disable-vhook --disable-ffserver --disable-ffplay --enable-swscaler --enable-pthreads
+ ./configure --disable-shared --enable-liba52bin --enable-gpl --disable-zlib --disable-vhook --disable-ffserver --disable-ffplay --enable-swscaler --enable-pthreads
all::
@for i in $(ALLDIRS); do \
echo "====> $(MAKE) $@ in $(SOURCEDIR)/$$i" ;\
Modified: branches/etch-a-ton/extern/ffmpeg/SConscript
===================================================================
--- branches/etch-a-ton/extern/ffmpeg/SConscript 2008-11-02 18:41:24 UTC (rev 17300)
+++ branches/etch-a-ton/extern/ffmpeg/SConscript 2008-11-02 19:44:18 UTC (rev 17301)
@@ -7,9 +7,9 @@
root = "extern/ffmpeg"
if env['OURPLATFORM'] == 'win32-mingw':
- ffmpeg_switches = "--disable-shared --enable-liba52bin --enable-gpl --disable-network --disable-zlib --disable-vhook --disable-ffserver --disable-ffplay --enable-swscaler --enable-pthreads --enable-libx264 --enable-libxvid --enable-libmp3lame"
+ ffmpeg_switches = "--disable-shared --enable-liba52bin --enable-gpl --disable-zlib --disable-vhook --disable-ffserver --disable-ffplay --enable-swscaler --enable-pthreads --enable-libx264 --enable-libxvid --enable-libmp3lame"
else:
- ffmpeg_switches = "--disable-shared --enable-liba52bin --enable-gpl --disable-network --disable-zlib --disable-vhook --disable-ffserver --disable-ffplay --enable-swscaler --enable-memalign-hack --enable-libx264 --enable-libxvid --enable-libmp3lame"
+ ffmpeg_switches = "--disable-shared --enable-liba52bin --enable-gpl --disable-zlib --disable-vhook --disable-ffserver --disable-ffplay --enable-swscaler --enable-memalign-hack --enable-libx264 --enable-libxvid --enable-libmp3lame"
if env['WITH_BF_OGG']:
ffmpeg_switches += " --enable-libogg --enable-libtheora --enable-libvorbis"
Copied: branches/etch-a-ton/extern/ffmpeg/libavdevice (from rev 17300, trunk/blender/extern/ffmpeg/libavdevice)
Deleted: branches/etch-a-ton/extern/ffmpeg/libavdevice/Makefile
===================================================================
--- trunk/blender/extern/ffmpeg/libavdevice/Makefile 2008-11-02 18:41:24 UTC (rev 17300)
+++ branches/etch-a-ton/extern/ffmpeg/libavdevice/Makefile 2008-11-02 19:44:18 UTC (rev 17301)
@@ -1,32 +0,0 @@
-include ../config.mak
-
-NAME=avdevice
-LIBVERSION=$(LAVDVERSION)
-LIBMAJOR=$(LAVDMAJOR)
-
-EXTRALIBS := -L$(BUILD_ROOT)/libavformat -lavformat$(BUILDSUF) \
- -L$(BUILD_ROOT)/libavcodec -lavcodec$(BUILDSUF) \
- -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
-
-CFLAGS += -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat
-
-OBJS = alldevices.o
-
-HEADERS = avdevice.h
-
-# input/output devices
-OBJS-$(CONFIG_BKTR_DEMUXER) += bktr.o
-OBJS-$(CONFIG_DV1394_DEMUXER) += dv1394.o
-OBJS-$(CONFIG_OSS_DEMUXER) += audio.o
-OBJS-$(CONFIG_OSS_MUXER) += audio.o
-OBJS-$(CONFIG_V4L2_DEMUXER) += v4l2.o
-OBJS-$(CONFIG_V4L_DEMUXER) += v4l.o
-OBJS-$(CONFIG_X11_GRAB_DEVICE_DEMUXER) += x11grab.o
-
-# external libraries
-OBJS-$(CONFIG_LIBDC1394_DEMUXER) += libdc1394.o
-
-CPPOBJS-$(CONFIG_AUDIO_BEOS_DEMUXER) += beosaudio.o
-CPPOBJS-$(CONFIG_AUDIO_BEOS_MUXER) += beosaudio.o
-
-include ../common.mak
Copied: branches/etch-a-ton/extern/ffmpeg/libavdevice/Makefile (from rev 17300, trunk/blender/extern/ffmpeg/libavdevice/Makefile)
===================================================================
--- branches/etch-a-ton/extern/ffmpeg/libavdevice/Makefile (rev 0)
+++ branches/etch-a-ton/extern/ffmpeg/libavdevice/Makefile 2008-11-02 19:44:18 UTC (rev 17301)
@@ -0,0 +1,32 @@
+include ../config.mak
+
+NAME=avdevice
+LIBVERSION=$(LAVDVERSION)
+LIBMAJOR=$(LAVDMAJOR)
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list