2.5 Sound:
authorJoerg Mueller <nexyon@gmail.com>
Sun, 30 Aug 2009 16:18:05 +0000 (16:18 +0000)
committerJoerg Mueller <nexyon@gmail.com>
Sun, 30 Aug 2009 16:18:05 +0000 (16:18 +0000)
* 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.

CMakeLists.txt
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/SConscript
source/blender/makesrna/intern/rna_userdef.c

index a92099698c61948dc8ec16cda41403bface6842c..1921ef65017abce8821b959f8b811f38276d15d0 100644 (file)
@@ -259,7 +259,7 @@ IF(WIN32)
   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 @@ IF(WIN32)
   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)
 
index 152f4031b91042fb58e2fa46f3313a7b5c103198..a1f42fbccb3c20baa1e52d003d2a30705da1203c 100644 (file)
@@ -75,6 +75,18 @@ IF(WITH_FFTW3)
   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)
index 1a3687af51e00ea23cc13482792c626469d554b6..a24c25b8b9574acfe95e8979acfdaddfc40752fc 100644 (file)
@@ -62,6 +62,15 @@ if env['WITH_BF_GAMEENGINE']:
 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))
index ba980d4caf4244f859e5af89f1e42fdb9233369a..a0716cc7dc702a772786f732234942290088bd7b 100644 (file)
@@ -2021,9 +2021,15 @@ static void rna_def_userdef_system(BlenderRNA *brna)
 
        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[] = {