Home Explore Help
Sign In
cpp
/
panda3d
mirror of https://github.com/panda3d/panda3d
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

GL_FRAMEWORK

David Rose 20 years ago
parent
7fdf481b0f
commit
6cad90ad28
2 changed files with 5 additions and 0 deletions
Unified View Show Diff Stats
  1. 4 0
      dtool/Config.pp
  2. 1 0
      dtool/pptempl/Global.pp

+ 4 - 0
dtool/Config.pp
View File 

@@ -481,6 +481,10 @@
 
   #defer GL_IPATH
 
   #defer GL_IPATH
 
   #defer GL_LPATH
 
   #defer GL_LPATH
 
   #define GL_LIBS opengl32.lib glu32.lib
 
   #define GL_LIBS opengl32.lib glu32.lib
 
+#elif $[OSX_PLATFORM]
 
+  #defer GL_IPATH
 
+  #defer GL_LPATH
 
+  #defer GL_FRAMEWORK OpenGL
 
 #else
 
 #else
 
   #defer GL_IPATH
 
   #defer GL_IPATH
 
   #defer GL_LPATH /usr/X11R6/lib
 
   #defer GL_LPATH /usr/X11R6/lib

+ 1 - 0
dtool/pptempl/Global.pp
View File 

@@ -123,6 +123,7 @@
 
   #define gl_lpath $[wildcard $[GL_LPATH]]
 
   #define gl_lpath $[wildcard $[GL_LPATH]]
 
   #define gl_cflags $[GL_CFLAGS]
 
   #define gl_cflags $[GL_CFLAGS]
 
   #define gl_libs $[GL_LIBS]
 
   #define gl_libs $[GL_LIBS]
 
+  #define gl_framework $[GL_FRAMEWORK]
 
 #endif
 
 #endif
 
 
 
 #if $[HAVE_MESA]
 
 #if $[HAVE_MESA]