[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19395] trunk/blender: [#18260] FMOD Removal
Campbell Barton
ideasman42 at gmail.com
Tue Mar 24 10:09:15 CET 2009
Revision: 19395
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19395
Author: campbellbarton
Date: 2009-03-24 10:09:10 +0100 (Tue, 24 Mar 2009)
Log Message:
-----------
[#18260] FMOD Removal
from Jorg Muller (nexyon)
also removed references to CVS in install
Modified Paths:
--------------
trunk/blender/INSTALL
trunk/blender/config/darwin-config.py
trunk/blender/config/irix6-config.py
trunk/blender/config/linux2-config.py
trunk/blender/config/linuxcross-config.py
trunk/blender/config/openbsd3-config.py
trunk/blender/config/sunos5-config.py
trunk/blender/config/win32-mingw-config.py
trunk/blender/config/win32-vc-config.py
trunk/blender/intern/SoundSystem/Makefile
trunk/blender/intern/SoundSystem/SND_DependKludge.h
trunk/blender/intern/SoundSystem/SoundDefines.h
trunk/blender/intern/SoundSystem/dummy/SND_DummyDevice.cpp
trunk/blender/intern/SoundSystem/intern/Makefile
trunk/blender/intern/SoundSystem/intern/SND_DeviceManager.cpp
trunk/blender/intern/SoundSystem/intern/SND_Scene.cpp
trunk/blender/intern/SoundSystem/intern/SND_Utils.cpp
trunk/blender/intern/SoundSystem/openal/SND_OpenALDevice.cpp
trunk/blender/make/example_scripts/linux_nanmakefiles.sh
trunk/blender/make/example_scripts/sunos_nanmakefiles.sh
trunk/blender/release/windows/specific.sh
trunk/blender/source/Makefile
trunk/blender/source/blender/include/BIF_editsound.h
trunk/blender/source/blender/src/buttons_scene.c
trunk/blender/source/blender/src/editsound.c
trunk/blender/source/gameengine/GamePlayer/ActiveX/BlenderPlayerCtl.cpp
trunk/blender/source/gameengine/GamePlayer/netscape/src/ketsji/KXH_unix_services.cpp
trunk/blender/source/nan_definitions.mk
trunk/blender/tools/btools.py
Modified: trunk/blender/INSTALL
===================================================================
--- trunk/blender/INSTALL 2009-03-24 06:53:57 UTC (rev 19394)
+++ trunk/blender/INSTALL 2009-03-24 09:09:10 UTC (rev 19395)
@@ -16,11 +16,9 @@
libjpeg: http://www.ijg.org/
libpng: http://www.libpng.org/pub/png/
zlib: http://www.gzip.org/zlib/
-ode: http://opende.sourceforge.net/
openal: http://www.openal.org/home/ (for linux/windows)
- sdl: http://www.libsdl.org/index.php (for openal)
- smpeg: http://www.lokigames.com/development/smpeg.php3 (for openal)
-fmod: http://www.fmod.org/
+ http://kcat.strangesoft.net/openal.html
+sdl: http://www.libsdl.org
mozilla: http://www.mozilla.org/
nspr: ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases
@@ -28,7 +26,7 @@
glut: http://www.opengl.org/developers/documentation/glut.html
-If you do not have OpenGL you will also need mesa:
+If you do not have OpenGL headers and libraries you will also need mesa:
mesa: http://www.mesa3d.org
If you want to compile with QuickTime enabled, download the SDK for your OS:
@@ -63,7 +61,7 @@
ADDED FTGL NOTE:
_____________________________
-ftgl now has been patched so much, that it's included in CVS/lib/
+ftgl now has been patched so much, that it's included in SVN/lib/
The sources for the patched ftgl will be made available soon...
@@ -72,8 +70,8 @@
*********************************************************************
*********************************************************************
-There are two build systems for unixy platforms, the old NaN Makefiles
-and the brand new SCons-based system.
+There are three build systems for unixy platforms, the old NaN Makefiles
+and the brand new SCons-based system and CMake.
The NaN system is best understood, if you want to use the configure system,
please help improve it. SCons has been added as a new build system for
@@ -89,8 +87,8 @@
First of all, make sure
-1) you have the full source tree available, either via CVS or as source download.
-2) you have the libs dir (CVSROOT/lib/ or bf-blender/lib/ ) checkout as well
+1) you have the full source tree available, either via SVN or as source download.
+2) you have the libs dir (SVNROOT/lib/ or bf-blender/lib/ ) checkout as well
Read about that here;
http://www.blender3d.org/cms/Building_Blender.117.0.html
@@ -129,13 +127,13 @@
NOTE 2:
That same 'guessconfig' name is used to read from bf-blender/lib/
-Since that directory comes from cvs, easiest is to create a symlink to that dir with the
+Since that directory comes from svn, easiest is to create a symlink to that dir with the
correct name.
-----------------------Basic SCon TIPS-----------------------------------
+----------------------Basic SCons TIPS----------------------------------
More documentation on the scons system is available at
blender/doc/blender-scons.txt and blender/doc/blender-scons-dev.txt. Where
@@ -146,16 +144,16 @@
sure these work properly you are ready to build with SCons.
Systems supported at the moment are:
-* Linux (Michel_)
+* Linux (Ken )
* Windows (jesterKing)
* Irix (Hos)
* Cygwin (Michel_)
* MacOS (sgefant)
All except Linux build with this system against the precompiled libraries,
-so be sure to get them from CVS, ie. for Windows:
+so be sure to get them from SVN, ie. for Windows:
-cvs -z3 -d:pserver:anonymous at cvs.blender.org:/cvsroot/bf-blender co lib/windows
+svn co https://svn.blender.org/svnroot/bf-blender/trunk/lib/windows
Be sure to do this at the same level your blender directory is at
(ie. /home/username/build/blender and /home/username/build/lib/OS).
@@ -205,10 +203,10 @@
to true you can do this with: export FREE_WINDOWS=true
EXTERNAL LIBARIES
-All external libraries that Blender depends on are found in CVS in
-precompiled form. If you did not already do so, check out lib/windows from CVS using
+All external libraries that Blender depends on are found in SVN in
+precompiled form. If you did not already do so, check out lib/windows from SVN using
-cvs -z3 -d:pserver:anonymous at cvs.blender.org:/cvsroot/bf-blender co lib/windows
+svn co https://svn.blender.org/svnroot/bf-blender/trunk/lib/windows
[NOTE: Make sure you are in the directory where the blender directory resides,
NOT in the blender directory itself! lib/windows must be in the same dir as
@@ -305,7 +303,6 @@
of the external libraries:
1. jpeg (fink install libjpeg)
2. png (fink install libpng3)
-3. cvs (fixes some bugs in the shipped cvs: fink install cvs)
4. python23 ((adds the static lib for python) fink install python23)
You will probably want to select python-nox when
it asks you. (Also read python note below)
@@ -318,8 +315,8 @@
export PY_FRAMEWORK = 1
Step 3:
-The rest of the external libraries are present in CVS in binary format so you
-don't have to download them. Precompiled libraries are found in CVS in
+The rest of the external libraries are present in SVN in binary format so you
+don't have to download them. Precompiled libraries are found in SVN in
directory:
$NANBLENDERHOME/lib/darwin-6.1-powerpc
If you are not running on a darwing kernel 6.1 (which is likely if you auto-
@@ -362,7 +359,7 @@
sudo ln -s /System/Library/Frameworks/OpenGL.framework/Versions/A/Headers /usr/include/GL
* build the unix version, not the mac one
* use ./configure then make and make install
-* the CVS version of freetype-config has the path on my computer, adjust it to yours if you want to rebuild fgtl
+* the SVN version of freetype-config has the path on my computer, adjust it to yours if you want to rebuild fgtl
FGTL
* freetype must be already installed and working
Modified: trunk/blender/config/darwin-config.py
===================================================================
--- trunk/blender/config/darwin-config.py 2009-03-24 06:53:57 UTC (rev 19394)
+++ trunk/blender/config/darwin-config.py 2009-03-24 09:09:10 UTC (rev 19395)
@@ -106,9 +106,6 @@
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'
Modified: trunk/blender/config/irix6-config.py
===================================================================
--- trunk/blender/config/irix6-config.py 2009-03-24 06:53:57 UTC (rev 19394)
+++ trunk/blender/config/irix6-config.py 2009-03-24 09:09:10 UTC (rev 19395)
@@ -39,9 +39,6 @@
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'
Modified: trunk/blender/config/linux2-config.py
===================================================================
--- trunk/blender/config/linux2-config.py 2009-03-24 06:53:57 UTC (rev 19394)
+++ trunk/blender/config/linux2-config.py 2009-03-24 09:09:10 UTC (rev 19395)
@@ -34,9 +34,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
-WITH_BF_FMOD = False
-BF_FMOD = LIBDIR + '/fmod'
-
WITH_BF_OPENEXR = True
WITH_BF_STATICOPENEXR = False
BF_OPENEXR = '/usr'
Modified: trunk/blender/config/linuxcross-config.py
===================================================================
--- trunk/blender/config/linuxcross-config.py 2009-03-24 06:53:57 UTC (rev 19394)
+++ trunk/blender/config/linuxcross-config.py 2009-03-24 09:09:10 UTC (rev 19395)
@@ -38,9 +38,6 @@
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'
Modified: trunk/blender/config/openbsd3-config.py
===================================================================
--- trunk/blender/config/openbsd3-config.py 2009-03-24 06:53:57 UTC (rev 19394)
+++ trunk/blender/config/openbsd3-config.py 2009-03-24 09:09:10 UTC (rev 19395)
@@ -22,9 +22,6 @@
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'
Modified: trunk/blender/config/sunos5-config.py
===================================================================
--- trunk/blender/config/sunos5-config.py 2009-03-24 06:53:57 UTC (rev 19394)
+++ trunk/blender/config/sunos5-config.py 2009-03-24 09:09:10 UTC (rev 19395)
@@ -28,9 +28,6 @@
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'
Modified: trunk/blender/config/win32-mingw-config.py
===================================================================
--- trunk/blender/config/win32-mingw-config.py 2009-03-24 06:53:57 UTC (rev 19394)
+++ trunk/blender/config/win32-mingw-config.py 2009-03-24 09:09:10 UTC (rev 19395)
@@ -38,9 +38,6 @@
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'
Modified: trunk/blender/config/win32-vc-config.py
===================================================================
--- trunk/blender/config/win32-vc-config.py 2009-03-24 06:53:57 UTC (rev 19394)
+++ trunk/blender/config/win32-vc-config.py 2009-03-24 09:09:10 UTC (rev 19395)
@@ -49,9 +49,6 @@
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'
Modified: trunk/blender/intern/SoundSystem/Makefile
===================================================================
--- trunk/blender/intern/SoundSystem/Makefile 2009-03-24 06:53:57 UTC (rev 19394)
+++ trunk/blender/intern/SoundSystem/Makefile 2009-03-24 09:09:10 UTC (rev 19395)
@@ -38,7 +38,6 @@
ifneq ($(NAN_NO_OPENAL),true)
ifeq ($(OS),windows)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list