TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 02:42:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Roger Hughston 2006-03-15 01:02:49 +00:00
parent f585b94829
commit c4ebca5a20
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
panda/metalibs/pandagl/Sources.pp
View File

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

11
panda/metalibs/pandagl/pandagl.cxx
View File

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