[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22892] branches/blender2.5/blender: 2. 5 Sound:

[Joerg Mueller]

Revision: 22892
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22892
Author:   nexyon
Date:     2009-08-30 18:18:05 +0200 (Sun, 30 Aug 2009)

Log Message:
-----------
2.5 Sound:

* Updated UserDef RNA so that only compiled in audio drivers are displayed. (Missing definitions in Makefiles, someone fix please!)
* Fixed libsndfile and ffmpeg building with CMake with msvc.

Modified Paths:
--------------
    branches/blender2.5/blender/CMakeLists.txt
    branches/blender2.5/blender/source/blender/makesrna/intern/CMakeLists.txt
    branches/blender2.5/blender/source/blender/makesrna/intern/SConscript
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_userdef.c

Modified: branches/blender2.5/blender/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/CMakeLists.txt	2009-08-30 15:00:42 UTC (rev 22891)
+++ branches/blender2.5/blender/CMakeLists.txt	2009-08-30 16:18:05 UTC (rev 22892)
@@ -259,7 +259,7 @@
   IF(WITH_SNDFILE)
 	SET(SNDFILE ${LIBDIR}/sndfile)
 	SET(SNDFILE_INC ${SNDFILE}/include)
-	SET(SNDFILE_LIB sndfile-1)
+	SET(SNDFILE_LIB libsndfile-1)
 	SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
   ENDIF(WITH_SNDFILE)
 
@@ -329,7 +329,7 @@
   SET(QUICKTIME_LIBPATH ${QUICKTIME}/Libraries)
 
   SET(FFMPEG ${LIBDIR}/ffmpeg)
-  SET(FFMPEG_INC ${FFMPEG}/include)
+  SET(FFMPEG_INC ${FFMPEG}/include ${FFMPEG}/include/msvc)
   SET(FFMPEG_LIB avcodec-52 avformat-52 avdevice-52 avutil-50 swscale-0)
   SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
 

Modified: branches/blender2.5/blender/source/blender/makesrna/intern/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/CMakeLists.txt	2009-08-30 15:00:42 UTC (rev 22891)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/CMakeLists.txt	2009-08-30 16:18:05 UTC (rev 22892)
@@ -75,6 +75,18 @@
   ADD_DEFINITIONS(-DFFTW3=1)
 ENDIF(WITH_FFTW3)
 
+IF(WITH_SDL)
+  ADD_DEFINITIONS(-DWITH_SDL)
+ENDIF(WITH_SDL)
+
+IF(WITH_OPENAL)
+  ADD_DEFINITIONS(-DWITH_OPENAL)
+ENDIF(WITH_OPENAL)
+
+IF(WITH_JACK)
+  ADD_DEFINITIONS(-DWITH_JACK)
+ENDIF(WITH_JACK)
+
 # Build makesrna executable
 ADD_EXECUTABLE(makesrna ${SRC} ${INC_FILES})
 TARGET_LINK_LIBRARIES(makesrna bf_dna)

Modified: branches/blender2.5/blender/source/blender/makesrna/intern/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/SConscript	2009-08-30 15:00:42 UTC (rev 22891)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/SConscript	2009-08-30 16:18:05 UTC (rev 22892)
@@ -59,9 +59,18 @@
 if env['WITH_BF_GAMEENGINE']:
 	defs.append('GAMEBLENDER=1')
 	
-if env['WITH_BF_FFTW3']:
+if env['WITH_BF_FFTW3']:
     defs.append('FFTW3=1')
 
+if env['WITH_BF_SDL']:
+    defs.append('WITH_SDL')
+
+if env['WITH_BF_OPENAL']:
+    defs.append('WITH_OPENAL')
+
+if env['WITH_BF_JACK']:
+    defs.append('WITH_JACK')
+
 makesrna_tool.Append(CPPDEFINES=defs)
 
 makesrna_tool.Append (CPPPATH = Split(incs))

Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_userdef.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_userdef.c	2009-08-30 15:00:42 UTC (rev 22891)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_userdef.c	2009-08-30 16:18:05 UTC (rev 22892)
@@ -2021,9 +2021,15 @@
 
 	static EnumPropertyItem audio_device_items[] = {
 		{0, "AUDIO_DEVICE_NULL", 0, "No Audio", "Null device - there will be no audio output."},
+#ifdef WITH_SDL
 		{1, "AUDIO_DEVICE_SDL", 0, "SDL", "SDL device - simple direct media layer, recommended for sequencer usage."},
+#endif
+#ifdef WITH_OPENAL
 		{2, "AUDIO_DEVICE_OPENAL", 0, "OpenAL", "OpenAL device - supports 3D audio, recommended for game engine usage."},
+#endif
+#ifdef WITH_JACK
 		{3, "AUDIO_DEVICE_JACK", 0, "Jack", "Jack device - open source pro audio, recommended for pro audio users."},
+#endif
 		{0, NULL, 0, NULL, NULL}};
 
 	static EnumPropertyItem audio_rate_items[] = {