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

disable building mpg123 conditionally

This commit is contained in:
cxgeorge 2001-07-05 03:47:45 +00:00
parent 637d442cf4
commit 3c2e1c7b91
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dtool/Config.pp
View File

@ -322,6 +322,9 @@
#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/pptempl/Global.pp
View File

@ -208,6 +208,9 @@
#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]
@ -243,6 +246,7 @@
$[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 ]
@ -273,6 +277,7 @@
$[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

2
panda/src/mpg123/Sources.pp
View File

@ -1,3 +1,5 @@
#define DIRECTORY_IF_MPG123 yes
#begin static_lib_target
#define TARGET mpg123
#define SOURCES \