Переглянути джерело

lots of little changes for os x

Dave Schuyler 22 роки тому
батько
коміт
01d65fe28c

+ 5 - 5
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

+ 2 - 1
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

+ 2 - 1
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

+ 2 - 1
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

+ 2 - 1
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

+ 1 - 0
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

+ 1 - 0
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

+ 8 - 0
panda/src/linmath/cmath.I

@@ -22,6 +22,14 @@
 #include <float.h>
 #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);
 }