LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-19 20:19:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged default into minor

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2014-09-28 15:56:04 -03:00
parent aba33bf2e7 d3e1993673
commit 34688e929e
26 changed files with 271 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/macosx/OSX.mm
+5 -7
View File
@@ -34,13 +34,11 @@ std::string getLoveInResources()
@autoreleasepool
{
// check to see if there are any .love files in Resources - props to stevejohnson/diordna
NSArray *lovePaths = [[NSBundle mainBundle] pathsForResourcesOfType:@"love" inDirectory:nil];
if ([lovePaths count] > 0)
{
NSString *firstLovePath = [lovePaths objectAtIndex:0];
path = std::string([firstLovePath UTF8String]);
}
// Check to see if there are any .love files in Resources.
NSString *lovepath = [[NSBundle mainBundle] pathForResource:nil ofType:@"love"];
if (lovepath != nil)
path = [lovepath UTF8String];
}
return path;