RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

changes for new audio system

This commit is contained in:
Dave Schuyler 2001-07-13 00:11:59 +00:00
parent c2c0d89aa8
commit 71735a5ff4
3 changed files with 13 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dtool/Config.pp
View File

@ -301,22 +301,9 @@
// own Config.pp to achieve that.
#defer NOTIFY_DEBUG $[< $[OPTIMIZE], 4]
// Do you want to build the audio interface? What additional
// libraries are required?
// Do you want to build the audio interface?
#define HAVE_AUDIO 1
#if $[eq $[PLATFORM],Win32]
// vars for older directsound-based audio interface, maybe be overwritten later in Global.pp
#define AUDIO_IPATH /mspsdk/Include
#define AUDIO_LPATH /mspsdk/Lib
#define AUDIO_LIBS winmm.lib dsound.lib user32.lib ole32.lib dxguid.lib
#else
#define AUDIO_IPATH
#define AUDIO_LPATH
#define AUDIO_LIBS
#endif
// Info for the RAD game tools, Miles Sound System
// note this may be overwritten in wintools Config.pp
#define RAD_MSS_IPATH /usr/include/Miles6/include
@ -324,9 +311,6 @@
#define RAD_MSS_LIBS Mss32
#defer HAVE_RAD_MSS $[libtest $[RAD_MSS_LPATH],$[RAD_MSS_LIBS]]
// Is Panda using the mpg123 library to play mp3, requiring it be built?
#define USE_MPG123 1
// Is Gtk-- installed? How should we run the gtkmm-config program?
// This matters only to programs in PANDATOOL.
#define GTKMM_CONFIG gtkmm-config

5
dtool/Package.pp
View File

@ -153,11 +153,6 @@
#set DO_PSTATS $[DO_PSTATS]
#set AUDIO_IPATH $[AUDIO_IPATH]
#set AUDIO_LPATH $[AUDIO_LPATH]
#set AUDIO_LIBS $[AUDIO_LIBS]
#set HAVE_AUDIO $[HAVE_AUDIO]
#set RAD_MSS_IPATH $[RAD_MSS_IPATH]
#set RAD_MSS_LPATH $[RAD_MSS_LPATH]
#set RAD_MSS_LIBS $[RAD_MSS_LIBS]

36
dtool/pptempl/Global.pp
View File

@ -203,20 +203,10 @@
#define net_libs $[NET_LIBS]
#endif
#if $[and $[eq $[PLATFORM],Win32], $[ne $[USE_RAD_MSS],]]
// Info for the RAD game tools, Miles Sound System
#define AUDIO_IPATH $[RAD_MSS_IPATH]
#define AUDIO_LPATH $[RAD_MSS_LPATH]
#define AUDIO_LIBS $[RAD_MSS_LIBS]
// Miles will play mp3, so we dont need the mpg123 lib
#define USE_MPG123
#endif
#if $[HAVE_AUDIO]
#define audio_ipath $[wildcard $[AUDIO_IPATH]]
#define audio_lpath $[wildcard $[AUDIO_LPATH]]
#define audio_libs $[AUDIO_LIBS]
#if $[HAVE_RAD_MSS]
#define rad_mss_ipath $[wildcard $[RAD_MSS_IPATH]]
#define rad_mss_lpath $[wildcard $[RAD_MSS_LPATH]]
#define rad_mss_libs $[RAD_MSS_LIBS]
#endif
// This variable, when evaluated in the scope of a particular directory,
@ -246,7 +236,6 @@
$[or $[not $[DIRECTORY_IF_IPC]],$[HAVE_IPC]], \
$[or $[not $[DIRECTORY_IF_NET]],$[HAVE_NET]], \
$[or $[not $[DIRECTORY_IF_AUDIO]],$[HAVE_AUDIO]], \
$[or $[not $[DIRECTORY_IF_MPG123]],$[USE_MPG123]], \
$[or $[not $[DIRECTORY_IF_INTERROGATE]],$[HAVE_INTERROGATE]], \
1 ]
@ -277,7 +266,6 @@
$[or $[not $[TARGET_IF_IPC]],$[HAVE_IPC]], \
$[or $[not $[TARGET_IF_NET]],$[HAVE_NET]], \
$[or $[not $[TARGET_IF_AUDIO]],$[HAVE_AUDIO]], \
$[or $[not $[TARGET_IF_MPG123]],$[USE_MPG123]], \
1 ]
// This takes advantage of the above two variables to get the actual
@ -419,8 +407,8 @@
#if $[ne $[USE_VRPN] $[components $[USE_VRPN],$[active_component_libs]],]
#set alt_cflags $[alt_cflags] $[vrpn_cflags]
#endif
#if $[ne $[USE_AUDIO] $[components $[USE_AUDIO],$[active_component_libs]],]
#set alt_cflags $[alt_cflags] $[audio_cflags]
#if $[ne $[USE_RAD_MSS] $[components $[USE_RAD_MSS],$[active_component_libs]],]
#set alt_cflags $[alt_cflags] $[rad_mss_cflags]
#endif
#if $[ne $[USE_MIKMOD] $[components $[USE_MIKMOD],$[active_component_libs]],]
#set alt_cflags $[alt_cflags] $[mikmod_cflags]
@ -484,8 +472,8 @@
#if $[ne $[USE_VRPN] $[components $[USE_VRPN],$[active_component_libs]],]
#set alt_ipath $[alt_ipath] $[vrpn_ipath]
#endif
#if $[ne $[USE_AUDIO] $[components $[USE_AUDIO],$[active_component_libs]],]
#set alt_ipath $[alt_ipath] $[audio_ipath]
#if $[ne $[USE_RAD_MSS] $[components $[USE_RAD_MSS],$[active_component_libs]],]
#set alt_ipath $[alt_ipath] $[rad_mss_ipath]
#endif
#if $[ne $[USE_MIKMOD] $[components $[USE_MIKMOD],$[active_component_libs]],]
#set alt_ipath $[alt_ipath] $[mikmod_ipath]
@ -549,8 +537,8 @@
#if $[ne $[USE_VRPN] $[components $[USE_VRPN],$[active_component_libs] $[transitive_link]],]
#set alt_lpath $[alt_lpath] $[vrpn_lpath]
#endif
#if $[ne $[USE_AUDIO] $[components $[USE_AUDIO],$[active_component_libs] $[transitive_link]],]
#set alt_lpath $[alt_lpath] $[audio_lpath]
#if $[ne $[USE_RAD_MSS] $[components $[USE_RAD_MSS],$[active_component_libs] $[transitive_link]],]
#set alt_lpath $[alt_lpath] $[rad_mss_lpath]
#endif
#if $[ne $[USE_MIKMOD] $[components $[USE_MIKMOD],$[active_component_libs] $[transitive_link]],]
#set alt_lpath $[alt_lpath] $[mikmod_lpath]
@ -615,8 +603,8 @@
#if $[ne $[USE_VRPN] $[components $[USE_VRPN],$[active_component_libs] $[transitive_link]],]
#set alt_libs $[alt_libs] $[vrpn_libs]
#endif
#if $[ne $[USE_AUDIO] $[components $[USE_AUDIO],$[active_component_libs] $[transitive_link]],]
#set alt_libs $[alt_libs] $[audio_libs]
#if $[ne $[USE_RAD_MSS] $[components $[USE_RAD_MSS],$[active_component_libs] $[transitive_link]],]
#set alt_libs $[alt_libs] $[rad_mss_libs]
#endif
#if $[ne $[USE_MIKMOD] $[components $[USE_MIKMOD],$[active_component_libs] $[transitive_link]],]
#set alt_libs $[alt_libs] $[mikmod_libs]