From 8ccbeb3a5a5b4a11631e9b51c4045e67fbcc0804 Mon Sep 17 00:00:00 2001
From: TSR Berry <20988865+TSRBerry@users.noreply.github.com>
Date: Thu, 15 Dec 2022 21:52:19 +0100
Subject: [PATCH] Fix first time compilation issues

Fix including obj directories
---
 Ryujinx.CustomTasks/GenerateArrays.cs                |  2 +-
 .../build/Ryujinx.CustomTasks.targets                | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/Ryujinx.CustomTasks/GenerateArrays.cs b/Ryujinx.CustomTasks/GenerateArrays.cs
index 871d294..d65fad3 100644
--- a/Ryujinx.CustomTasks/GenerateArrays.cs
+++ b/Ryujinx.CustomTasks/GenerateArrays.cs
@@ -180,7 +180,7 @@ namespace Ryujinx.CustomTasks
             {
                 string fullPath = item.GetMetadata("FullPath");
 
-                if (fullPath.EndsWith(".g.cs") || fullPath.Contains("obj\\Debug\\") || fullPath.Contains("obj\\Release\\"))
+                if (fullPath.EndsWith(".g.cs") || fullPath.Contains(Path.Combine("obj","Debug")) || fullPath.Contains(Path.Combine("obj", "Release")))
                 {
                     continue;
                 }
diff --git a/Ryujinx.CustomTasks/build/Ryujinx.CustomTasks.targets b/Ryujinx.CustomTasks/build/Ryujinx.CustomTasks.targets
index 2da6a7b..13c2e07 100644
--- a/Ryujinx.CustomTasks/build/Ryujinx.CustomTasks.targets
+++ b/Ryujinx.CustomTasks/build/Ryujinx.CustomTasks.targets
@@ -10,20 +10,16 @@
 
     <!--A target that generates code, which is executed before the compilation-->
     <!-- TODO: Make "Outputs" more generic -->
-    <Target Name="BeforeCompile" Inputs="@(ArrayInputFiles)" Outputs="$(ArrayOutputPath)\Arrays.g.cs">
+    <Target Name="BeforeCompile" Inputs="@(ArrayInputFiles)" Outputs="$(ArrayOutputPath)\Arrays.g.cs;$(ArrayOutputPath)\IArray.g.cs">
         <!--Calling our custom task -->
         <GenerateArrays ArrayNamespace="$(ArrayNamespace)" InputFiles="@(ArrayInputFiles)" OutputPath="$(ArrayOutputPath)">
-            <Output TaskParameter="OutputFiles" PropertyName="ArrayOutputFiles" />
+            <!--Our generated files are included to be compiled-->
+            <Output TaskParameter="OutputFiles" ItemName="Compile" />
         </GenerateArrays>
-        <!--Our generated files are included to be compiled-->
-        <ItemGroup>
-            <Compile Remove="@(ArrayOutputFiles)" />
-            <Compile Include="@(ArrayOutputFiles)" />
-        </ItemGroup>
     </Target>
 
     <!--The generated files are deleted after a general clean. It will force the regeneration on rebuild -->
     <Target Name="AfterClean">
-        <Delete Files="$(ArrayOutputPath)\*.g.cs" />
+        <Delete Files="$(ArrayOutputPath)\Arrays.g.cs;$(ArrayOutputPath)\IArray.g.cs" />
     </Target>
 </Project>