Browse Source

Add OSX Gl is linked to this libray by default on OSX

Roger Hughston 20 years ago
parent
commit
c4ebca5a20
2 changed files with 12 additions and 1 deletions
  1. 1 1
      panda/metalibs/pandagl/Sources.pp
  2. 11 0
      panda/metalibs/pandagl/pandagl.cxx

+ 1 - 1
panda/metalibs/pandagl/Sources.pp

@@ -13,7 +13,7 @@
   // directly into Panda.
   #define COMPONENT_LIBS \
       glgsg glxdisplay  \
-      wgldisplay
+      wgldisplay osxdisplay
 #endif
 
 #define LOCAL_LIBS gsgbase display express

+ 11 - 0
panda/metalibs/pandagl/pandagl.cxx

@@ -13,6 +13,11 @@
 
 #endif  // LINK_IN_GL
 
+
+#ifdef IS_OSX
+#include "config_osxdisplay.h"
+#endif
+
 // By including checkPandaVersion.h, we guarantee that runtime
 // attempts to load libpandagl.so/.dll will fail if they inadvertently
 // link with the wrong version of libdtool.so/.dll.
@@ -35,4 +40,10 @@ init_libpandagl() {
   init_libwgldisplay();
 #endif  // HAVE_GL
 #endif  // LINK_IN_GL
+
+
+#ifdef IS_OSX
+  init_libosxdisplay();
+#endif
+
 }