Merge branch 'development' into Prefabs/ProcessStackAddPrefabBug

2022-01-05 11:12:57 -08:00
parent 31e51f8c3a 89067fe667
commit 13375cd7d9
710 changed files with 145396 additions and 19297 deletions
@@ -270,8 +270,6 @@ set(FILES
    Physics/WindBus.h
    Process/ProcessCommunicator.cpp
    Process/ProcessCommunicator.h
-    Process/ProcessWatcher.cpp
-    Process/ProcessWatcher.h
    Process/ProcessCommon_fwd.h
    Process/ProcessCommunicator.h
    Process/ProcessWatcher.cpp
@@ -83,4 +83,9 @@ namespace AzFramework
    {

    }
+
+    AZStd::string ProcessLauncher::ProcessLaunchInfo::GetCommandLineParametersAsString() const
+    {
+        return AZStd::string{};
+    }
 } //namespace AzFramework