mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-10 00:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed unused variable, fixed chdir regression.

Browse Source
This commit is contained in:
Camilla Berglund 2012-02-15 01:57:43 +01:00
parent 4a9545317e
commit 84ea69358f
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/cocoa_init.m
View File

@ -35,23 +35,28 @@
//======================================================================== //========================================================================
static void changeToResourcesDirectory(void) static void changeToResourcesDirectory(void)
{ {
char resourcesPath[MAXPATHLEN];
CFBundleRef bundle = CFBundleGetMainBundle(); CFBundleRef bundle = CFBundleGetMainBundle();
if (!bundle) if (!bundle)
return; return;
CFURLRef resourcesURL = CFBundleCopyResourcesDirectoryURL(bundle); CFURLRef resourcesURL = CFBundleCopyResourcesDirectoryURL(bundle);
char resourcesPath[MAXPATHLEN];
CFStringRef name = CFURLCopyLastPathComponent(resourcesURL); CFStringRef last = CFURLCopyLastPathComponent(resourcesURL);
if (CFStringCompare(CFSTR("Resources"), name, 0) != kCFCompareEqualTo) if (CFStringCompare(CFSTR("Resources"), last, 0) != kCFCompareEqualTo)
{
CFRelease(last);
CFRelease(resourcesURL);
return; return;
}
CFRelease(name); CFRelease(last);
if (!CFURLGetFileSystemRepresentation(resourcesURL, if (!CFURLGetFileSystemRepresentation(resourcesURL,
TRUE, true,
(UInt8*) resourcesPath, (UInt8*) resourcesPath,
MAXPATHLEN)); MAXPATHLEN))
{ {
CFRelease(resourcesURL); CFRelease(resourcesURL);
return; return;
@ -82,8 +87,7 @@ int _glfwPlatformInit(void)
return GL_FALSE; return GL_FALSE;
} }
if (_glfwLibrary.NS.bundled) changeToResourcesDirectory();
changeToResourcesDirectory();
_glfwLibrary.NS.desktopMode = _glfwLibrary.NS.desktopMode =
(NSDictionary*) CGDisplayCurrentMode(CGMainDisplayID()); (NSDictionary*) CGDisplayCurrentMode(CGMainDisplayID());

1
src/cocoa_platform.h
View File

@ -91,7 +91,6 @@ typedef struct _GLFWlibraryNS
// dlopen handle for dynamically loading OpenGL extension entry points // dlopen handle for dynamically loading OpenGL extension entry points
void* OpenGLFramework; void* OpenGLFramework;
GLboolean bundled;
id desktopMode; id desktopMode;
id delegate; id delegate;
id autoreleasePool; id autoreleasePool;

1
src/cocoa_window.m
View File

@ -500,7 +500,6 @@ static NSString* findAppName(void)
[name isKindOfClass:[NSString class]] && [name isKindOfClass:[NSString class]] &&
![@"" isEqualToString:name]) ![@"" isEqualToString:name])
{ {
_glfwLibrary.NS.bundled = GL_TRUE;
return name; return name;
} }
} }