Mercurial > sdl-ios-xcode
comparison src/video/maccommon/SDL_macgl.c @ 1659:14717b52abc0 SDL-1.3
Merge trunk-1.3-3
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Wed, 17 May 2006 08:18:28 +0000 |
parents | 96c2f89cc7e1 |
children | 782fd950bd46 c121d94672cb a1b03ba2fcd0 |
comparison
equal
deleted
inserted
replaced
1658:e49147870aac | 1659:14717b52abc0 |
---|---|
166 } | 166 } |
167 | 167 |
168 int Mac_GL_LoadLibrary(_THIS, const char *location) | 168 int Mac_GL_LoadLibrary(_THIS, const char *location) |
169 { | 169 { |
170 if (location == NULL) | 170 if (location == NULL) |
171 #if __MACH__ | |
172 location = "/System/Library/Frameworks/OpenGL.framework/OpenGL"; | |
173 #else | |
171 location = "OpenGLLibrary"; | 174 location = "OpenGLLibrary"; |
175 #endif | |
172 | 176 |
173 this->hidden->libraryHandle = SDL_LoadObject(location); | 177 this->hidden->libraryHandle = SDL_LoadObject(location); |
174 | 178 |
175 this->gl_config.driver_loaded = 1; | 179 this->gl_config.driver_loaded = 1; |
176 return (this->hidden->libraryHandle != NULL) ? 0 : -1; | 180 return (this->hidden->libraryHandle != NULL) ? 0 : -1; |