From 01d65fe28cb1d858a5c8f98f650c8e6ef3275c1b Mon Sep 17 00:00:00 2001 From: Dave Schuyler Date: Fri, 2 Apr 2004 03:08:14 +0000 Subject: [PATCH] lots of little changes for os x --- panda/metalibs/panda/Sources.pp | 10 +++++----- panda/metalibs/pandaegg/Sources.pp | 3 ++- panda/metalibs/pandafx/Sources.pp | 3 ++- panda/metalibs/pandaphysics/Sources.pp | 3 ++- panda/src/audio/Sources.pp | 3 ++- panda/src/distort/Sources.pp | 1 + panda/src/gobj/Sources.pp | 1 + panda/src/linmath/cmath.I | 8 ++++++++ 8 files changed, 23 insertions(+), 9 deletions(-) diff --git a/panda/metalibs/panda/Sources.pp b/panda/metalibs/panda/Sources.pp index 9f7d8dcbe6..c4f3aea8e6 100644 --- a/panda/metalibs/panda/Sources.pp +++ b/panda/metalibs/panda/Sources.pp @@ -19,11 +19,11 @@ switchnode pnmtext text tform tiff lerp loader putil \ audio pgui pandabase glstuff - - - -#define LOCAL_LIBS downloader express pandabase -#define OTHER_LIBS dtoolconfig dtool +#define LOCAL_LIBS \ + downloader event express pandabase +#define OTHER_LIBS \ + interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #if $[LINK_IN_GL] #define BUILDING_DLL $[BUILDING_DLL] BUILDING_PANDAGL diff --git a/panda/metalibs/pandaegg/Sources.pp b/panda/metalibs/pandaegg/Sources.pp index a2eb79ff1a..cbd4f54236 100644 --- a/panda/metalibs/pandaegg/Sources.pp +++ b/panda/metalibs/pandaegg/Sources.pp @@ -11,7 +11,8 @@ egg2pg egg2sg egg builder #define LOCAL_LIBS putil express -#define OTHER_LIBS dtoolconfig dtool +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolbase:c dtoolutil:c dtool:m #begin metalib_target #define TARGET pandaegg diff --git a/panda/metalibs/pandafx/Sources.pp b/panda/metalibs/pandafx/Sources.pp index 0ce466289d..c92a280256 100644 --- a/panda/metalibs/pandafx/Sources.pp +++ b/panda/metalibs/pandafx/Sources.pp @@ -10,7 +10,8 @@ #define COMPONENT_LIBS \ distort effects #define LOCAL_LIBS putil express -#define OTHER_LIBS dtoolconfig dtool +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolbase:c dtoolutil:c dtool:m #begin metalib_target #define TARGET pandafx diff --git a/panda/metalibs/pandaphysics/Sources.pp b/panda/metalibs/pandaphysics/Sources.pp index 8d0eb51401..bc2faaa1e4 100644 --- a/panda/metalibs/pandaphysics/Sources.pp +++ b/panda/metalibs/pandaphysics/Sources.pp @@ -15,7 +15,8 @@ #endif #define LOCAL_LIBS linmath putil express -#define OTHER_LIBS dtoolconfig dtool +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolbase:c dtoolutil:c dtool:m #begin metalib_target #define TARGET pandaphysics diff --git a/panda/src/audio/Sources.pp b/panda/src/audio/Sources.pp index 09456a5033..db4d07e9d0 100644 --- a/panda/src/audio/Sources.pp +++ b/panda/src/audio/Sources.pp @@ -1,4 +1,5 @@ -#define OTHER_LIBS dtoolconfig dtool +#define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ + dtoolutil:c dtoolbase:c dtool:m #define BUILD_DIRECTORY $[HAVE_AUDIO] #begin lib_target diff --git a/panda/src/distort/Sources.pp b/panda/src/distort/Sources.pp index f3a5279cd2..e8f3168927 100644 --- a/panda/src/distort/Sources.pp +++ b/panda/src/distort/Sources.pp @@ -1,5 +1,6 @@ #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ dtoolutil:c dtoolbase:c dtool:m +#define OSX_SYS_LIBS mx #begin lib_target #define TARGET distort diff --git a/panda/src/gobj/Sources.pp b/panda/src/gobj/Sources.pp index 095585b1ff..af0807b55a 100644 --- a/panda/src/gobj/Sources.pp +++ b/panda/src/gobj/Sources.pp @@ -1,5 +1,6 @@ #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \ dtoolutil:c dtoolbase:c dtool:m +#define OSX_SYS_LIBS mx #begin lib_target #define TARGET gobj diff --git a/panda/src/linmath/cmath.I b/panda/src/linmath/cmath.I index 93dca7f348..71e785ecf2 100644 --- a/panda/src/linmath/cmath.I +++ b/panda/src/linmath/cmath.I @@ -22,6 +22,14 @@ #include #endif +#ifdef __APPLE__ +#define isnan( x ) ( ( sizeof ( x ) == sizeof(double) ) ? \ + __isnand ( x ) : \ + ( sizeof ( x ) == sizeof( float) ) ? \ + __isnanf ( x ) : \ + __isnan ( x ) ) +#endif + INLINE_LINMATH float csqrt(float v) { return sqrtf(v); }