CMake: Add audio/movies components.

panda/CMakeLists.txt

@@ -40,6 +40,8 @@ add_subdirectory(src/pgraph)
 add_subdirectory(src/pgraphnodes)
 add_subdirectory(src/cull)
 add_subdirectory(src/display)
+add_subdirectory(src/movies)
+add_subdirectory(src/audio)
 add_subdirectory(src/chan)
 add_subdirectory(src/char)
 add_subdirectory(src/dgraph)
@@ -62,8 +64,19 @@ add_subdirectory(metalibs/panda)
 add_subdirectory(metalibs/pandagl)
 add_subdirectory(metalibs/pandaegg)
 
-add_python_module(core p3chan p3char p3collide p3cull p3device p3dgraph
-  p3display p3downloader p3event p3express p3gobj p3grutil p3gsgbase p3linmath
-  p3mathutil p3parametrics p3pgraph p3pgraphnodes p3pgui p3pipeline p3pnmimage
-  p3pnmtext p3pstatclient p3putil p3recorder p3text p3tform)
-add_python_module(egg p3egg p3egg2pg)
+# Now add the Python modules:
+set(CORE_MODULE_COMPONENTS
+    p3chan p3char p3collide p3cull p3device p3dgraph p3display p3downloader
+    p3event p3express p3gobj p3grutil p3gsgbase p3linmath p3mathutil p3nativenet
+    p3net p3movies p3parametrics p3pgraph p3pgraphnodes p3pgui p3pipeline
+    p3pnmimage p3pnmtext p3pstatclient p3putil p3recorder p3text p3tform)
+
+if(HAVE_AUDIO)
+  list(APPEND CORE_MODULE_COMPONENTS p3audio)
+endif()
+
+add_python_module(core ${CORE_MODULE_COMPONENTS})
+
+if(HAVE_EGG)
+  add_python_module(egg p3egg p3egg2pg)
+endif()

panda/src/audio/CMakeLists.txt

@@ -0,0 +1,24 @@
+if(HAVE_AUDIO)
+  set(P3AUDIO_HEADERS
+      config_audio.h
+      filterProperties.h filterProperties.I
+      audioLoadRequest.h audioLoadRequest.I
+      audioManager.h audioManager.I
+      audioSound.h audioSound.I
+      nullAudioManager.h
+      nullAudioSound.h)
+
+  set(P3AUDIO_SOURCES
+      config_audio.cxx
+      filterProperties.cxx
+      audioLoadRequest.cxx
+      audioManager.cxx
+      audioSound.cxx
+      nullAudioManager.cxx
+      nullAudioSound.cxx)
+
+  composite_sources(p3audio P3AUDIO_SOURCES)
+  add_library(p3audio ${P3AUDIO_HEADERS} ${P3AUDIO_SOURCES})
+  target_link_libraries(p3audio p3putil p3event p3movies p3linmath)
+  target_interrogate(p3audio ALL)
+endif()

panda/src/grutil/CMakeLists.txt

@@ -37,5 +37,8 @@ set(P3GRUTIL_SOURCES
 
 composite_sources(p3grutil P3GRUTIL_SOURCES)
 add_library(p3grutil ${P3GRUTIL_SOURCES} ${P3GRUTIL_HEADERS})
-target_link_libraries(p3grutil p3display p3text)
+target_link_libraries(p3grutil p3display p3text p3movies)
+if(HAVE_AUDIO)
+  target_link_libraries(p3grutil p3audio)
+endif()
 target_interrogate(p3grutil ALL)

panda/src/movies/CMakeLists.txt

@@ -0,0 +1,39 @@
+set(P3MOVIES_HEADERS
+    config_movies.h
+    inkblotVideo.h inkblotVideo.I
+    inkblotVideoCursor.h inkblotVideoCursor.I
+    microphoneAudio.h microphoneAudio.I
+    movieAudio.h movieAudio.I
+    movieAudioCursor.h movieAudioCursor.I
+    movieTypeRegistry.h movieTypeRegistry.I
+    movieVideo.h movieVideo.I
+    movieVideoCursor.h movieVideoCursor.I
+    userDataAudio.h userDataAudio.I
+    userDataAudioCursor.h userDataAudioCursor.I
+    vorbisAudio.h vorbisAudio.I
+    vorbisAudioCursor.h vorbisAudioCursor.I
+    wavAudio.h wavAudio.I
+    wavAudioCursor.h wavAudioCursor.I)
+
+set(P3MOVIES_SOURCES
+    config_movies.cxx
+    inkblotVideo.cxx
+    inkblotVideoCursor.cxx
+    microphoneAudio.cxx
+    microphoneAudioDS.cxx
+    movieAudio.cxx
+    movieAudioCursor.cxx
+    movieTypeRegistry.cxx
+    movieVideo.cxx
+    movieVideoCursor.cxx
+    userDataAudio.cxx
+    userDataAudioCursor.cxx
+    vorbisAudio.cxx
+    vorbisAudioCursor.cxx
+    wavAudio.cxx
+    wavAudioCursor.cxx)
+
+composite_sources(p3movies P3MOVIES_SOURCES)
+add_library(p3movies ${P3MOVIES_HEADERS} ${P3MOVIES_SOURCES})
+target_link_libraries(p3movies p3pandabase p3express p3pstatclient p3gobj p3dconfig p3prc)
+target_interrogate(p3movies ALL)