Browse Source

IPC fixes for OSX

Josh Engebretson 10 years ago
parent
commit
4927dba8ea

+ 5 - 2
Source/AtomicEditor/Source/Player/AEPlayer.cpp

@@ -73,13 +73,16 @@ void AEPlayer::HandleIPCWorkerExit(StringHash eventType, VariantMap& eventData)
 
 bool AEPlayer::Play(AEPlayerMode mode, const IntRect &rect)
 {
+    Editor* editor = GetSubsystem<Editor>();
     ToolCore::ToolEnvironment* env = GetSubsystem<ToolCore::ToolEnvironment>();
     const String& editorBinary = env->GetEditorBinary();
 
+    Project* project = editor->GetProject();
+
     Vector<String> paths;
     paths.Push(env->GetCoreDataDir());
     paths.Push(env->GetPlayerDataDir());
-    paths.Push("/Users/josh/Dev/atomic/AtomicExamples/UIExample/Resources");
+    paths.Push(project->GetResourcePath());
 
     String resourcePaths;
     resourcePaths.Join(paths, "!");
@@ -93,7 +96,7 @@ bool AEPlayer::Play(AEPlayerMode mode, const IntRect &rect)
 
     String dump;
     dump.Join(vargs, " ");
-    LOGINFOF("Launching Broker %s", dump.CString());
+    LOGINFOF("Launching Broker %s %s", editorBinary.CString(), dump.CString());
 
     IPC* ipc = GetSubsystem<IPC>();
     broker_ = ipc->SpawnWorker(editorBinary, vargs);

+ 1 - 1
Source/AtomicEditor/Source/Player/AEPlayerApplication.cpp

@@ -108,9 +108,9 @@ void AEPlayerApplication::Setup()
             String argument = arguments[i].ToLower();
             String value = i + 1 < arguments.Size() ? arguments[i + 1] : String::EMPTY;
 
-            LOGERRORF("Starting IPCWorker %s", argument.CString());
             if (argument.StartsWith("--ipc-server=") || argument.StartsWith("--ipc-client="))
             {
+                LOGINFOF("Starting IPCWorker %s", argument.CString());
 
                 Vector<String> ipc = argument.Split(argument.CString(), '=');
                 if (ipc.Size() == 2)

+ 1 - 1
Source/ToolCore/ToolEnvironment.cpp

@@ -42,7 +42,7 @@ bool ToolEnvironment::InitFromJSON()
         // default to build directories
 
         SetRootSourceDir(ATOMIC_ROOT_SOURCE_DIR);
-        SetRootBuildDir(ATOMIC_ROOT_BUILD_DIR);
+        SetRootBuildDir(ATOMIC_ROOT_BUILD_DIR, true);
 
         return true;
     }