Merge pull request #1068 from AtomicGameEngine/JME-ATOMIC-OSXEDITORPATH

Possible fix for OS X resource prefix issue (specify absolute path based on executable in app bundle)

Source/AtomicApp/Player/IPCPlayerApp.cpp

@@ -121,7 +121,7 @@ namespace Atomic
 #ifdef __APPLE__
                     if (!resourcePrefix.Length())
                     {
-                        engineParameters_["ResourcePrefixPaths"] = "../Resources";
+                        engineParameters_["ResourcePrefixPaths"] = fileSystem->GetProgramDir() + "../Resources";
                     }
 #else
                     if (!resourcePrefix.Length())

Source/AtomicApp/Player/PlayerApp.cpp

@@ -55,6 +55,8 @@ namespace Atomic
     {
         AppBase::Setup();
 
+        FileSystem *filesystem = GetSubsystem<FileSystem>();
+
         engineParameters_.InsertNew("WindowTitle", "AtomicPlayer");
 
 #if (ATOMIC_PLATFORM_ANDROID)
@@ -83,11 +85,10 @@ namespace Atomic
 #elif ATOMIC_PLATFORM_ANDROID
         //engineParameters_.InsertNew("ResourcePrefixPaths"], "assets");
 #elif ATOMIC_PLATFORM_OSX
-        engineParameters_.InsertNew("ResourcePrefixPaths", "../Resources");
+        engineParameters_.InsertNew("ResourcePrefixPaths", filesystem->GetProgramDir() + "../Resources");
 #endif
 
         // Setup player log
-        FileSystem *filesystem = GetSubsystem<FileSystem>();
         engineParameters_.InsertNew("LogName", filesystem->GetAppPreferencesDir("AtomicPlayer", "Logs") + "AtomicPlayer.log");
 
         // Register JS packages

Source/AtomicEditor/Application/AEEditorApp.cpp

@@ -126,7 +126,7 @@ namespace AtomicEditor
 #else
 
 #ifdef ATOMIC_PLATFORM_OSX
-        engineParameters_["ResourcePrefixPaths"] = "../Resources";
+        engineParameters_["ResourcePrefixPaths"] = filesystem->GetProgramDir() + "../Resources";
 
 #else
         engineParameters_["ResourcePrefixPaths"] = filesystem->GetProgramDir() + "Resources";

Source/AtomicPlayer/Application/AtomicPlayer.cpp

@@ -103,7 +103,7 @@ void AtomicPlayerApp::Setup()
 #elif ATOMIC_PLATFORM_ANDROID
     //engineParameters_.InsertNew("ResourcePrefixPaths"], "assets");
 #elif ATOMIC_PLATFORM_OSX
-    engineParameters_.InsertNew("ResourcePrefixPaths", "../Resources");
+    engineParameters_.InsertNew("ResourcePrefixPaths", filesystem->GetProgramDir() + "../Resources");
 #endif
 
     const Vector<String>& arguments = GetArguments();