am c6623763: am f29ee346: Merge "emulator: opengl: Open libGL.dylib as a framework on Mac"

* commit 'c6623763231c35b738863f5429ddf11c1af3a0be':
  emulator: opengl: Open libGL.dylib as a framework on Mac
This commit is contained in:
David 'Digit' Turner
2011-08-25 05:56:45 -07:00
committed by Android Git Automerger

View File

@@ -37,7 +37,7 @@ static GL_FUNC_PTR getGLFuncAddress(const char *funcName) {
static osUtils::dynLibrary* libGL = osUtils::dynLibrary::open("opengl32"); static osUtils::dynLibrary* libGL = osUtils::dynLibrary::open("opengl32");
ret = (GL_FUNC_PTR)wglGetProcAddress(funcName); ret = (GL_FUNC_PTR)wglGetProcAddress(funcName);
#elif defined(__APPLE__) #elif defined(__APPLE__)
static osUtils::dynLibrary* libGL = osUtils::dynLibrary::open("libGL.dylib"); static osUtils::dynLibrary* libGL = osUtils::dynLibrary::open("/System/Library/Frameworks/OpenGL.framework/OpenGL");
#endif #endif
if(!ret && libGL){ if(!ret && libGL){
ret = libGL->findSymbol(funcName); ret = libGL->findSymbol(funcName);