Fixed Initializer.cpp to use the proper naming conventions :)

git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/trunk@1029 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
laurentgom 2009-02-28 20:47:48 +00:00
parent 9919e57bbd
commit 34ce4c00f5

View File

@ -1,7 +1,7 @@
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Lucas Soltic (elmerod@gmail.com) and Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Lucas Soltic (elmerod@gmail.com) and Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warranty. // This software is provided 'as-is', without any express or implied warranty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
@ -35,10 +35,8 @@
namespace sf namespace sf
{ {
namespace priv namespace priv
{ {
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Under Mac OS X, when launching an application from the Finder, /// Under Mac OS X, when launching an application from the Finder,
/// the default working directory is the user home directory ; /// the default working directory is the user home directory ;
@ -49,60 +47,59 @@ namespace priv
/// The "constructor" attribute forces the function to be called /// The "constructor" attribute forces the function to be called
/// at library loading time. /// at library loading time.
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void InitializeWorkingDirectory(void) __attribute__ ((constructor));
void working_directory_initializer(void) __attribute__ ((constructor)); void InitializeWorkingDirectory(void)
void working_directory_initializer(void)
{ {
char pathBuffer[4096]; char PathBuffer[4096];
// Get the application bundle // Get the application bundle
CFBundleRef mainBundle = CFBundleGetMainBundle(); CFBundleRef MainBundle = CFBundleGetMainBundle();
if (!mainBundle) if (!MainBundle)
{ {
std::cerr << "*** SFML: error getting the application main bundle" << std::endl; std::cerr << "Error getting the application main bundle" << std::endl;
return; return;
} }
// Get the resource directory URL // Get the resource directory URL
CFURLRef resourceDirectory = CFBundleCopyResourcesDirectoryURL(mainBundle); CFURLRef ResourceDirectory = CFBundleCopyResourcesDirectoryURL(MainBundle);
if (!resourceDirectory) if (!ResourceDirectory)
{ {
std::cerr << "*** SFML: error getting the resource directory of the main bundle" << std::endl; std::cerr << "Error getting the resource directory of the main bundle" << std::endl;
return; return;
} }
// Convert it as absolute URL // Convert it as absolute URL
CFURLRef absoluteURL = CFURLCopyAbsoluteURL(resourceDirectory); CFURLRef AbsoluteURL = CFURLCopyAbsoluteURL(ResourceDirectory);
if (!absoluteURL) if (!AbsoluteURL)
{ {
std::cerr << "*** SFML: error gettint the resource directory as an absolute URL" << std::endl; std::cerr << "Error getting the resource directory as an absolute URL" << std::endl;
CFRelease(resourceDirectory); CFRelease(ResourceDirectory);
return; return;
} }
// Get the POSIX style path // Get the POSIX style path
CFStringRef absolutePath = CFURLCopyFileSystemPath(absoluteURL, kCFURLPOSIXPathStyle); CFStringRef AbsolutePath = CFURLCopyFileSystemPath(AbsoluteURL, kCFURLPOSIXPathStyle);
if (!absolutePath) if (!AbsolutePath)
{ {
std::cerr << "*** SFML: error converting the resource directory URL as a POSIX path" << std::endl; std::cerr << "Error converting the resource directory URL as a POSIX path" << std::endl;
CFRelease(absoluteURL); CFRelease(AbsoluteURL);
CFRelease(resourceDirectory); CFRelease(ResourceDirectory);
return; return;
} }
// Get the path as C string and set it // Get the path as C string and set it
if (CFStringGetCString(absolutePath, pathBuffer, 4096, kCFStringEncodingASCII)) if (CFStringGetCString(AbsolutePath, PathBuffer, 4096, kCFStringEncodingASCII))
chdir(pathBuffer); chdir(PathBuffer);
else else
std::cerr << "*** SFML: error copying the resource directory path in the C buffer" << std::endl; std::cerr << "Error copying the resource directory path in the C buffer" << std::endl;
CFRelease(absolutePath); CFRelease(AbsolutePath);
CFRelease(absoluteURL); CFRelease(AbsoluteURL);
CFRelease(resourceDirectory); CFRelease(ResourceDirectory);
} }
} // namespace priv } // namespace priv