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

fix fmod for OSX

This commit is contained in:
David Rose 2006-11-01 23:45:17 +00:00
parent 694873dc37
commit 4e0d07c7ec
4 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dtool/Config.pp
View File

@ -717,10 +717,10 @@
// Info for the Fmod audio engine
// note this may be overwritten in wintools Config.pp
#define FMOD_IPATH
#define FMOD_LPATH
#define FMOD_LIBS fmod
#defer HAVE_FMOD $[libtest $[FMOD_LPATH],$[FMOD_LIBS]]
#define FMODEX_IPATH
#define FMODEX_LPATH
#define FMODEX_LIBS fmodex
#defer HAVE_FMODEX $[libtest $[FMODEX_LPATH],$[FMODEX_LIBS]]
// Info for http://www.sourceforge.net/projects/chromium
// note this may be overwritten in wintools Config.pp

10
dtool/LocalSetup.pp
View File

@ -86,10 +86,10 @@
#else
#print - Did not find Miles Sound System
#endif
#if $[HAVE_FMOD]
#print + FMOD sound library
#if $[HAVE_FMODEX]
#print + FMODex sound library
#else
#print - Did not find FMOD sound library
#print - Did not find FMODex sound library
#endif
#if $[HAVE_FREETYPE]
#print + Freetype
@ -150,8 +150,8 @@ $[cdefine PYTHON_FRAMEWORK]
/* Define if we have RAD game tools, Miles Sound System installed. */
$[cdefine HAVE_RAD_MSS]
/* Define if we have FMOD installed. */
$[cdefine HAVE_FMOD]
/* Define if we have FMODex installed. */
$[cdefine HAVE_FMODEX]
/* Define if we have Freetype 2.0 or better available. */
$[cdefine HAVE_FREETYPE]

8
dtool/Package.pp
View File

@ -240,10 +240,10 @@
#set RAD_MSS_LIBS $[RAD_MSS_LIBS]
#set HAVE_RAD_MSS $[HAVE_RAD_MSS]
#set FMOD_IPATH $[unixfilename $[FMOD_IPATH]]
#set FMOD_LPATH $[unixfilename $[FMOD_LPATH]]
#set FMOD_LIBS $[FMOD_LIBS]
#set HAVE_FMOD $[HAVE_FMOD]
#set FMODEX_IPATH $[unixfilename $[FMODEX_IPATH]]
#set FMODEX_LPATH $[unixfilename $[FMODEX_LPATH]]
#set FMODEX_LIBS $[FMODEX_LIBS]
#set HAVE_FMODEX $[HAVE_FMODEX]
#set CHROMIUM_IPATH $[unixfilename $[CHROMIUM_IPATH]]
#set CHROMIUM_LPATH $[unixfilename $[CHROMIUM_LPATH]]

9
dtool/pptempl/Global.pp
View File

@ -309,10 +309,11 @@
#define rad_mss_libs $[RAD_MSS_LIBS]
#endif
#if $[HAVE_FMOD]
#define fmod_ipath $[wildcard $[FMOD_IPATH]]
#define fmod_lpath $[wildcard $[FMOD_LPATH]]
#define fmod_libs $[FMOD_LIBS]
#if $[HAVE_FMODEX]
#define fmodex_ipath $[wildcard $[FMODEX_IPATH]]
#define fmodex_lpath $[wildcard $[FMODEX_LPATH]]
#define fmodex_cflags $[FMODEX_CFLAGS]
#define fmodex_libs $[FMODEX_LIBS]
#endif
#if $[HAVE_CHROMIUM]