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

fix missing symbol when trying to compile with both HAVE_CARBON and HAVE_COCOA

This commit is contained in:
rdb 2013-02-13 15:16:51 +00:00
parent cd5fe3fb74
commit d521615f3d
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,12 +12,10 @@
#include "wglGraphicsPipe.h"
#endif
#ifdef HAVE_COCOA
#if defined(HAVE_COCOA)
#include "config_cocoadisplay.h"
#include "cocoaGraphicsPipe.h"
#endif
#ifdef HAVE_CARBON
#elif defined(HAVE_CARBON)
#include "config_osxdisplay.h"
#include "osxGraphicsPipe.h"
#endif
@ -53,11 +51,9 @@ init_libpandagl() {
init_libwgldisplay();
#endif // HAVE_GL
#ifdef HAVE_COCOA
#if defined(HAVE_COCOA)
init_libcocoadisplay();
#endif
#ifdef HAVE_CARBON
#elif defined(HAVE_CARBON)
init_libosxdisplay();
#endif