Sfoglia il codice sorgente

Fixed blast compilation error in non-unity build. Fixed also mac error. (#9305)

Signed-off-by: moraaar <[email protected]>
moraaar 3 anni fa
parent
commit
0151b66d22

+ 1 - 1
Code/Tools/ProjectManager/Platform/Mac/ProjectUtils_mac.cpp

@@ -81,7 +81,7 @@ namespace O3DE::ProjectManager
 
             // Query for the version of xcodebuild (if installed)
             auto queryXcodeBuildVersion = ExecuteCommandResult("xcodebuild", QStringList{ "-version" });
-            if (!queryCmakeInstalled.IsSuccess())
+            if (!queryXcodeBuildVersion.IsSuccess())
             {
                 return AZ::Failure(QObject::tr("Unable to detect XCodeBuilder on this host."));
             }

+ 1 - 0
Gems/Blast/Code/Editor/ConfigurationWidget.h

@@ -8,6 +8,7 @@
 #pragma once
 
 #if !defined(Q_MOC_RUN)
+#include <AzCore/Memory/SystemAllocator.h>
 #include <Blast/BlastSystemBus.h>
 #include <QWidget>
 #endif

+ 1 - 0
Gems/Blast/Code/Source/Editor/Material/LegacyBlastMaterialPrefabConversion.cpp

@@ -21,6 +21,7 @@
 #include <AzToolsFramework/Prefab/PrefabDomUtils.h>
 
 #include <Material/BlastMaterialAsset.h>
+#include <Editor/EditorBlastFamilyComponent.h>
 
 namespace Blast
 {