Browse Source

Add OpenAL support to ppremake

rdb 16 years ago
parent
commit
44169b9e75
5 changed files with 52 additions and 19 deletions
  1. 12 0
      dtool/Config.pp
  2. 8 0
      dtool/LocalSetup.pp
  3. 6 0
      dtool/Package.pp
  4. 7 0
      dtool/pptempl/Global.pp
  5. 19 19
      panda/src/audiotraits/Sources.pp

+ 12 - 0
dtool/Config.pp

@@ -829,6 +829,18 @@
 #define FMODEX_LIBS $[if $[libtest $[FMODEX_LPATH],fmodex64],fmodex64,fmodex]
 #define FMODEX_LIBS $[if $[libtest $[FMODEX_LPATH],fmodex64],fmodex64,fmodex]
 #defer HAVE_FMODEX $[libtest $[FMODEX_LPATH],$[FMODEX_LIBS]]
 #defer HAVE_FMODEX $[libtest $[FMODEX_LPATH],$[FMODEX_LIBS]]
 
 
+// Info for the OpenAL audio engine
+#define OPENAL_IPATH
+#define OPENAL_LPATH
+#if $[OSX_PLATFORM]
+  #define OPENAL_LIBS
+  #define OPENAL_FRAMEWORK OpenAL
+#else
+  #define OPENAL_LIBS openal
+  #define OPENAL_FRAMEWORK
+#endif
+#defer HAVE_OPENAL $[or $[OPENAL_FRAMEWORK],$[libtest $[OPENAL_LPATH],$[OPENAL_LIBS]]]
+
 // Info for the Ageia PhysX SDK
 // Info for the Ageia PhysX SDK
 #define PHYSX_IPATH
 #define PHYSX_IPATH
 #define PHYSX_LPATH
 #define PHYSX_LPATH

+ 8 - 0
dtool/LocalSetup.pp

@@ -91,6 +91,11 @@
 #else
 #else
 #print - Did not find FMOD Ex sound library
 #print - Did not find FMOD Ex sound library
 #endif
 #endif
+#if $[HAVE_OPENAL]
+#print + OpenAL sound library
+#else
+#print - Did not find OpenAL sound library
+#endif
 #if $[HAVE_PHYSX]
 #if $[HAVE_PHYSX]
 #print + Ageia PhysX
 #print + Ageia PhysX
 #else
 #else
@@ -230,6 +235,9 @@ $[cdefine HAVE_RAD_MSS]
 /* Define if we have FMODex installed. */
 /* Define if we have FMODex installed. */
 $[cdefine HAVE_FMODEX]
 $[cdefine HAVE_FMODEX]
 
 
+/* Define if we have OpenAL installed. */
+$[cdefine HAVE_OPENAL]
+
 /* Define if we have Ageia PhysX SDK installed. */
 /* Define if we have Ageia PhysX SDK installed. */
 $[cdefine HAVE_PHYSX]
 $[cdefine HAVE_PHYSX]
 
 

+ 6 - 0
dtool/Package.pp

@@ -257,6 +257,12 @@
 #set FMODEX_LIBS $[FMODEX_LIBS]
 #set FMODEX_LIBS $[FMODEX_LIBS]
 #set HAVE_FMODEX $[HAVE_FMODEX]
 #set HAVE_FMODEX $[HAVE_FMODEX]
 
 
+#set OPENAL_IPATH $[unixfilename $[OPENAL_IPATH]]
+#set OPENAL_LPATH $[unixfilename $[OPENAL_LPATH]]
+#set OPENAL_LIBS $[OPENAL_LIBS]
+#set OPENAL_FRAMEWORK $[unixfilename $[OPENAL_FRAMEWORK]]
+#set HAVE_OPENAL $[HAVE_OPENAL]
+
 #set PHYSX_IPATH $[unixfilename $[PHYSX_IPATH]]
 #set PHYSX_IPATH $[unixfilename $[PHYSX_IPATH]]
 #set PHYSX_LPATH $[unixfilename $[PHYSX_LPATH]]
 #set PHYSX_LPATH $[unixfilename $[PHYSX_LPATH]]
 #set PHYSX_LIBS $[PHYSX_LIBS]
 #set PHYSX_LIBS $[PHYSX_LIBS]

+ 7 - 0
dtool/pptempl/Global.pp

@@ -366,6 +366,13 @@
   #define fmodex_libs $[FMODEX_LIBS]
   #define fmodex_libs $[FMODEX_LIBS]
 #endif
 #endif
 
 
+#if $[HAVE_OPENAL]
+  #define openal_ipath $[wildcard $[OPENAL_IPATH]]
+  #define openal_lpath $[wildcard $[OPENAL_LPATH]]
+  #define openal_libs $[OPENAL_LIBS]
+  #define openal_framework $[OPENAL_FRAMEWORK]
+#endif
+
 #if $[HAVE_PHYSX]
 #if $[HAVE_PHYSX]
   #define physx_ipath $[wildcard $[PHYSX_IPATH]]
   #define physx_ipath $[wildcard $[PHYSX_IPATH]]
   #define physx_lpath $[wildcard $[PHYSX_LPATH]]
   #define physx_lpath $[wildcard $[PHYSX_LPATH]]

+ 19 - 19
panda/src/audiotraits/Sources.pp

@@ -49,25 +49,25 @@
 
 
 #end lib_target
 #end lib_target
 
 
-//#begin lib_target
-//  #define TARGET openal_audio
-//  #define BUILD_TARGET $[HAVE_OPENAL]
-//  #define USE_PACKAGES openal
-//  #define BUILDING_DLL BUILDING_OPENAL_AUDIO
-//  #define LOCAL_LIBS audio event
-//  #define WIN_SYS_LIBS $[WIN_SYS_LIBS] user32.lib advapi32.lib winmm.lib
-//
-//  #define COMBINED_SOURCES $[TARGET]_composite1.cxx
-//
-//  #define SOURCES \
-//      config_openalAudio.h \
-//      openalAudioManager.h \
-//      openalAudioSound.I openalAudioSound.h
-//
-//  #define INCLUDED_SOURCES \
-//      config_openalAudio.cxx openalAudioManager.cxx openalAudioSound.cxx
-//
-//#end lib_target
+#begin lib_target
+  #define TARGET openal_audio
+  #define BUILD_TARGET $[HAVE_OPENAL]
+  #define USE_PACKAGES openal
+  #define BUILDING_DLL BUILDING_OPENAL_AUDIO
+  #define LOCAL_LIBS audio event
+  #define WIN_SYS_LIBS $[WIN_SYS_LIBS] user32.lib advapi32.lib winmm.lib
+
+  #define COMBINED_SOURCES $[TARGET]_composite1.cxx
+
+  #define SOURCES \
+      config_openalAudio.h \
+      openalAudioManager.h \
+      openalAudioSound.I openalAudioSound.h
+
+  #define INCLUDED_SOURCES \
+      config_openalAudio.cxx openalAudioManager.cxx openalAudioSound.cxx
+
+#end lib_target
 
 
 //#begin lib_target
 //#begin lib_target
 //  #define TARGET audio_linux
 //  #define TARGET audio_linux