Reference and build ColorLib from PPC and MS auto !

3 files changed, 72 insertions, 39 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
index 7895a9355..cd4eb4dd3 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
@@ -343,22 +343,6 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
-    <Content Include="..\..\Build\ColorLib\Debug\Tango.ColorLib_v1.dll">
-      <Link>Tango.ColorLib_v1.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\..\Build\ColorLib\Debug\Tango.ColorLib_v2.dll">
-      <Link>Tango.ColorLib_v2.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\..\Build\ColorLib\Debug\Tango.ColorLib_v3.dll">
-      <Link>Tango.ColorLib_v3.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\..\Build\ColorLib\Debug\Tango.ColorLib_v4.dll">
-      <Link>Tango.ColorLib_v4.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="..\..\tcc\benchmarks\benchmarks_rgb_lab.csv">
       <Link>TCC\benchmarks_rgb_lab.csv</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -542,6 +526,37 @@
       <Project>{cb0b0aa2-bb24-4bca-a720-45e397684e12}</Project>
       <Name>Tango.MachineStudio.Common</Name>
     </ProjectReference>
+
+    <!--ColorLib-->
+    <ProjectReference Include="..\..\ColorLib\Tango.ColorLib_v4\Tango.ColorLib_v4.vcxproj">
+      <Project>{E9528353-7D41-4AA8-BBAC-D65B7FE3A0D6}</Project>
+      <Name>Tango.ColorLib_v4</Name>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+      <OutputItemType>Content</OutputItemType>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </ProjectReference>
+    <ProjectReference Include="..\..\ColorLib\Tango.ColorLib_v3\Tango.ColorLib_v3.vcxproj">
+      <Project>{A3A8ADA0-C150-4E30-A60D-11F291FDBF7A}</Project>
+      <Name>Tango.ColorLib_v3</Name>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+      <OutputItemType>Content</OutputItemType>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </ProjectReference>
+    <ProjectReference Include="..\..\ColorLib\Tango.ColorLib_v2\Tango.ColorLib_v2.vcxproj">
+      <Project>{1A3FC7FB-403C-4B3D-B705-28FCE11317DD}</Project>
+      <Name>Tango.ColorLib_v2</Name>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+      <OutputItemType>Content</OutputItemType>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </ProjectReference>
+    <ProjectReference Include="..\..\ColorLib\Tango.ColorLib_v1\Tango.ColorLib_v1.vcxproj">
+      <Project>{CF4C66B0-CD13-4D31-8133-339A01E7E6F2}</Project>
+      <Name>Tango.ColorLib_v1</Name>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+      <OutputItemType>Content</OutputItemType>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </ProjectReference>
+    <!--ColorLib-->
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Images\design.png" />
@@ -681,7 +696,7 @@ if $(ConfigurationName) == Release RD /S /Q "$(TargetDir)lib\"</PostBuildEvent>
   </Target>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_UseGlobalSettings="False" BuildVersion_DetectChanges="True" BuildVersion_UpdateFileVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.DeltaBaseYearDayOfYear" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_StartDate="2000/1/1" />
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_BuildVersioningStyle="None.None.Increment.DeltaBaseYearDayOfYear" BuildVersion_UpdateFileVersion="True" BuildVersion_DetectChanges="True" BuildVersion_UseGlobalSettings="False" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
index e738dbd43..081d79f3e 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj
@@ -426,18 +426,6 @@
     <Resource Include="Images\GlobalStatus\shutdown_icon_Anim.gif" />
     <Resource Include="Images\GlobalStatus\standby_Anim.gif" />
     <Resource Include="Images\bug.png" />
-    <Content Include="..\..\Build\ColorLib\Debug\Tango.ColorLib_v1.dll">
-      <Link>Tango.ColorLib_v1.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\..\Build\ColorLib\Debug\Tango.ColorLib_v2.dll">
-      <Link>Tango.ColorLib_v2.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\..\Build\ColorLib\Debug\Tango.ColorLib_v3.dll">
-      <Link>Tango.ColorLib_v3.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Resource Include="Images\cartridge_validation.png" />
     <Resource Include="Images\machine-image.png" />
     <Resource Include="Images\Menu\backup.png" />
@@ -456,10 +444,6 @@
     <Resource Include="Images\firmware.png" />
     <Resource Include="Images\power_off_2.gif" />
     <Resource Include="Images\loading_anim.gif" />
-    <Content Include="..\..\Build\ColorLib\Debug\Tango.ColorLib_v4.dll">
-      <Link>Tango.ColorLib_v4.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Resource Include="Images\thread_loading_preview.png" />
     <Resource Include="Images\ThreadLoading\FeedingUnits\1.JPG" />
     <Resource Include="Images\ThreadLoading\FeedingUnits\2.JPG" />
@@ -620,6 +604,36 @@
       <Project>{208c8bd8-72c6-4e3c-acaa-351091a2acc7}</Project>
       <Name>Tango.PPC.Shared</Name>
     </ProjectReference>
+    <!--ColorLib-->
+    <ProjectReference Include="..\..\ColorLib\Tango.ColorLib_v4\Tango.ColorLib_v4.vcxproj">
+      <Project>{E9528353-7D41-4AA8-BBAC-D65B7FE3A0D6}</Project>
+      <Name>Tango.ColorLib_v4</Name>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+      <OutputItemType>Content</OutputItemType>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </ProjectReference>
+    <ProjectReference Include="..\..\ColorLib\Tango.ColorLib_v3\Tango.ColorLib_v3.vcxproj">
+      <Project>{A3A8ADA0-C150-4E30-A60D-11F291FDBF7A}</Project>
+      <Name>Tango.ColorLib_v3</Name>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+      <OutputItemType>Content</OutputItemType>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </ProjectReference>
+    <ProjectReference Include="..\..\ColorLib\Tango.ColorLib_v2\Tango.ColorLib_v2.vcxproj">
+      <Project>{1A3FC7FB-403C-4B3D-B705-28FCE11317DD}</Project>
+      <Name>Tango.ColorLib_v2</Name>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+      <OutputItemType>Content</OutputItemType>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </ProjectReference>
+    <ProjectReference Include="..\..\ColorLib\Tango.ColorLib_v1\Tango.ColorLib_v1.vcxproj">
+      <Project>{CF4C66B0-CD13-4D31-8133-339A01E7E6F2}</Project>
+      <Name>Tango.ColorLib_v1</Name>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+      <OutputItemType>Content</OutputItemType>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </ProjectReference>
+    <!--ColorLib-->
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Images\liquid.png" />
diff --git a/Software/Visual_Studio/Tango.sln b/Software/Visual_Studio/Tango.sln
index c9ca85279..83c36a91e 100644
--- a/Software/Visual_Studio/Tango.sln
+++ b/Software/Visual_Studio/Tango.sln
@@ -2938,6 +2938,7 @@ Global
 		{50119E79-5012-4B36-8438-953DD5FC06E6}.Release|x86.ActiveCfg = Release|Any CPU
 		{50119E79-5012-4B36-8438-953DD5FC06E6}.Release|x86.Build.0 = Release|Any CPU
 		{CF4C66B0-CD13-4D31-8133-339A01E7E6F2}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{CF4C66B0-CD13-4D31-8133-339A01E7E6F2}.Debug|Any CPU.Build.0 = Debug|Win32
 		{CF4C66B0-CD13-4D31-8133-339A01E7E6F2}.Debug|ARM.ActiveCfg = Debug|Win32
 		{CF4C66B0-CD13-4D31-8133-339A01E7E6F2}.Debug|ARM64.ActiveCfg = Debug|Win32
 		{CF4C66B0-CD13-4D31-8133-339A01E7E6F2}.Debug|x64.ActiveCfg = Debug|x64
@@ -2952,6 +2953,7 @@ Global
 		{CF4C66B0-CD13-4D31-8133-339A01E7E6F2}.Release|x86.ActiveCfg = Release|Win32
 		{CF4C66B0-CD13-4D31-8133-339A01E7E6F2}.Release|x86.Build.0 = Release|Win32
 		{1A3FC7FB-403C-4B3D-B705-28FCE11317DD}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{1A3FC7FB-403C-4B3D-B705-28FCE11317DD}.Debug|Any CPU.Build.0 = Debug|Win32
 		{1A3FC7FB-403C-4B3D-B705-28FCE11317DD}.Debug|ARM.ActiveCfg = Debug|Win32
 		{1A3FC7FB-403C-4B3D-B705-28FCE11317DD}.Debug|ARM64.ActiveCfg = Debug|Win32
 		{1A3FC7FB-403C-4B3D-B705-28FCE11317DD}.Debug|x64.ActiveCfg = Debug|x64
@@ -2966,6 +2968,7 @@ Global
 		{1A3FC7FB-403C-4B3D-B705-28FCE11317DD}.Release|x86.ActiveCfg = Release|Win32
 		{1A3FC7FB-403C-4B3D-B705-28FCE11317DD}.Release|x86.Build.0 = Release|Win32
 		{A3A8ADA0-C150-4E30-A60D-11F291FDBF7A}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{A3A8ADA0-C150-4E30-A60D-11F291FDBF7A}.Debug|Any CPU.Build.0 = Debug|Win32
 		{A3A8ADA0-C150-4E30-A60D-11F291FDBF7A}.Debug|ARM.ActiveCfg = Debug|Win32
 		{A3A8ADA0-C150-4E30-A60D-11F291FDBF7A}.Debug|ARM64.ActiveCfg = Debug|Win32
 		{A3A8ADA0-C150-4E30-A60D-11F291FDBF7A}.Debug|x64.ActiveCfg = Debug|x64
@@ -3676,6 +3679,7 @@ Global
 		{F15985C7-DF60-41CF-9333-D98BB8B43E6C}.Release|x86.ActiveCfg = Release|Any CPU
 		{F15985C7-DF60-41CF-9333-D98BB8B43E6C}.Release|x86.Build.0 = Release|Any CPU
 		{E9528353-7D41-4AA8-BBAC-D65B7FE3A0D6}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{E9528353-7D41-4AA8-BBAC-D65B7FE3A0D6}.Debug|Any CPU.Build.0 = Debug|Win32
 		{E9528353-7D41-4AA8-BBAC-D65B7FE3A0D6}.Debug|ARM.ActiveCfg = Debug|Win32
 		{E9528353-7D41-4AA8-BBAC-D65B7FE3A0D6}.Debug|ARM64.ActiveCfg = Debug|Win32
 		{E9528353-7D41-4AA8-BBAC-D65B7FE3A0D6}.Debug|x64.ActiveCfg = Debug|x64
@@ -4323,12 +4327,12 @@ Global
 		{F1DC98EF-C50A-4E84-9A39-211A68626FBA} = {5F6BBAA8-EAD0-4B18-97E5-55B4F56DD760}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {7986F7F4-A86A-4994-B1B6-0988D7F057B6}
-		BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear
-		BuildVersion_UpdateAssemblyVersion = True
-		BuildVersion_UpdateFileVersion = False
-		BuildVersion_StartDate = 2000/1/1
-		BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs
 		BuildVersion_UseGlobalSettings = False
+		BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs
+		BuildVersion_StartDate = 2000/1/1
+		BuildVersion_UpdateFileVersion = False
+		BuildVersion_UpdateAssemblyVersion = True
+		BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear
+		SolutionGuid = {7986F7F4-A86A-4994-B1B6-0988D7F057B6}
 	EndGlobalSection
 EndGlobal