From ee2dfdb815d523b69bc0b05280203e4f8f510db8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Pedro?= <jpedrolmail@gmail.com>
Date: Wed, 14 Feb 2018 21:23:25 +0000
Subject: [PATCH] Build system fixes.

---
 .../Cosmos.Build.Tasks/build/Cosmos.Build.targets | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/source/Cosmos.Build.Tasks/build/Cosmos.Build.targets b/source/Cosmos.Build.Tasks/build/Cosmos.Build.targets
index fad3a67ee..5959f94e9 100644
--- a/source/Cosmos.Build.Tasks/build/Cosmos.Build.targets
+++ b/source/Cosmos.Build.Tasks/build/Cosmos.Build.targets
@@ -27,8 +27,10 @@
     </PropertyGroup>
 
     <PropertyGroup>
+        <DebugEnabled Condition="'$(DebugEnabled)' == '' AND '$(Configuration)' == 'Debug'">True</DebugEnabled>
+        <DebugEnabled Condition="'$(DebugEnabled)' == ''">False</DebugEnabled>
+        
         <BinFormat Condition="'$(BinFormat)' == ''">ELF</BinFormat>
-        <DebugEnabled Condition="'$(DebugEnabled)' == ''">True</DebugEnabled>
         <DebugMode Condition="'$(DebugMode)' == ''">Source</DebugMode>
         <TraceMode Condition="'$(TraceMode)' == ''">User</TraceMode>
         <StackCorruptionDetectionEnabled Condition="'$(StackCorruptionDetectionEnabled)' == ''">True</StackCorruptionDetectionEnabled>
@@ -55,13 +57,22 @@
         <CosmosBuildTasksAssembly Condition="'$(CosmosBuildTasksAssembly)' == '' OR !Exists('$(CosmosBuildTasksAssembly)')">$(CosmosToolsPath)Cosmos.Build.Tasks.dll</CosmosBuildTasksAssembly>
     </PropertyGroup>
 
-    <ItemGroup>
+    <ItemGroup Condition="'$(KernelPkg)' == ''">
         <PlugsReference Include="$(KernelAssembliesDir)Cosmos.Core_Asm.dll" />
         <PlugsReference Include="$(KernelAssembliesDir)Cosmos.Core_Plugs.dll" />
         <PlugsReference Include="$(KernelAssembliesDir)Cosmos.Debug.Kernel.Plugs.Asm.dll" />
         <PlugsReference Include="$(KernelAssembliesDir)Cosmos.System2_Plugs.dll" />
     </ItemGroup>
 
+    <ItemGroup Condition="'$(KernelPkg)' == 'X86'">
+        <PlugsReference Include="$(KernelAssembliesDir)Cosmos.CPU.x86.dll" />
+        <PlugsReference Include="$(KernelAssembliesDir)Cosmos.CPU_Asm.dll" />
+        <PlugsReference Include="$(KernelAssembliesDir)Cosmos.CPU_Plugs.dll" />
+        <PlugsReference Include="$(KernelAssembliesDir)Cosmos.Debug.Kernel.Plugs.Asm.dll" />
+        <PlugsReference Include="$(KernelAssembliesDir)Cosmos.Platform.PC.dll" />
+        <PlugsReference Include="$(KernelAssembliesDir)Cosmos.Plugs.TapRoot.dll" />
+    </ItemGroup>
+
     <UsingTask TaskName="Cosmos.Build.Tasks.CreateSyslinuxConfig" AssemblyFile="$(CosmosBuildTasksAssembly)" />
     <UsingTask TaskName="Cosmos.Build.Tasks.ExtractMapFromElfFile" AssemblyFile="$(CosmosBuildTasksAssembly)" />
     <UsingTask TaskName="Cosmos.Build.Tasks.IL2CPU" AssemblyFile="$(CosmosBuildTasksAssembly)" />