Browse Source

*** empty log message ***

Mike Goslin 25 years ago
parent
commit
94cd079177

+ 1 - 2
panda/metalibs/panda/Sources.pp

@@ -15,8 +15,7 @@
     gsgmisc light linmath mathutil net pnm \
     pnmimagetypes pnmimage sgattrib sgmanip sgraph sgraphutil \
     switchnode text tform tiff lerp loader putil effects \
-    audio pandabase \
-//     audio audio_load_midi audio_load_st audio_load_wav pandabase \
+     audio audio_load_midi audio_load_st audio_load_wav pandabase 
 
 #define LOCAL_LIBS downloader event ipc express pandabase
 #define OTHER_LIBS dtool

+ 0 - 34
panda/src/audio/Sources.pp

@@ -27,40 +27,6 @@
 
 #end lib_target
 
-#begin lib_target
-  #define TARGET audio_load_midi
-  #define BUILDING_DLL BUILDING_MISC
-  #define LOCAL_LIBS \
-    audio
-
-  #define SOURCES \
-    audio_load_midi.cxx
-
-#end lib_target
-
-#begin lib_target
-  #define TARGET audio_load_wav
-  #define BUILDING_DLL BUILDING_MISC
-  #define LOCAL_LIBS \
-    audio
-
-  #define SOURCES \
-    audio_load_wav.cxx
-
-#end lib_target
-
-#begin lib_target
-  #define TARGET audio_load_st
-  #define BUILDING_DLL BUILDING_MISC
-  #define USE_SOXST yes
-  #define LOCAL_LIBS \
-    audio
-
-  #define SOURCES \
-    audio_load_st.cxx
-
-#end lib_target
-
 #begin test_bin_target
   #define TARGET test_audio
   #define LOCAL_LIBS \

+ 35 - 0
panda/src/audiotraits/Sources.pp

@@ -0,0 +1,35 @@
+#define OTHER_LIBS dtool
+
+#begin lib_target
+  #define TARGET audio_load_midi
+  #define BUILDING_DLL BUILDING_MISC
+  #define LOCAL_LIBS \
+    audio
+
+  #define SOURCES \
+    audio_load_midi.cxx
+
+#end lib_target
+
+#begin lib_target
+  #define TARGET audio_load_wav
+  #define BUILDING_DLL BUILDING_MISC
+  #define LOCAL_LIBS \
+    audio
+
+  #define SOURCES \
+    audio_load_wav.cxx
+
+#end lib_target
+
+#begin lib_target
+  #define TARGET audio_load_st
+  #define BUILDING_DLL BUILDING_MISC
+  #define USE_SOXST yes
+  #define LOCAL_LIBS \
+    audio
+
+  #define SOURCES \
+    audio_load_st.cxx
+
+#end lib_target

+ 0 - 0
panda/src/audio/audio_load_midi.cxx → panda/src/audiotraits/audio_load_midi.cxx


+ 0 - 0
panda/src/audio/audio_load_st.cxx → panda/src/audiotraits/audio_load_st.cxx


+ 0 - 0
panda/src/audio/audio_load_wav.cxx → panda/src/audiotraits/audio_load_wav.cxx