From efe5e931ccff01b56b8b65784b577297d6adf121 Mon Sep 17 00:00:00 2001
From: michaelangel007 <testcraft@sharedcraft.com>
Date: Mon, 29 Dec 2014 10:59:38 -0800
Subject: [PATCH] Win32 MSVC2010 Solution/Project cleanup

---
 MSVC2010.sln                       |  2 +-
 hgr2tga.vcxproj => hgr2rgb.vcxproj | 13 +++++++--
 hgr2rgb.vcxproj.filters            | 42 ++++++++++++++++++++++++++++++
 test.sh                            |  4 ++-
 4 files changed, 57 insertions(+), 4 deletions(-)
 rename hgr2tga.vcxproj => hgr2rgb.vcxproj (87%)
 create mode 100644 hgr2rgb.vcxproj.filters

diff --git a/MSVC2010.sln b/MSVC2010.sln
index 2c4e67c..cb662cc 100644
--- a/MSVC2010.sln
+++ b/MSVC2010.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hgr2tga", "hgr2tga.vcxproj", "{3D05589D-6761-4225-9719-817919B75BEE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hgr2rgb", "hgr2rgb.vcxproj", "{3D05589D-6761-4225-9719-817919B75BEE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/hgr2tga.vcxproj b/hgr2rgb.vcxproj
similarity index 87%
rename from hgr2tga.vcxproj
rename to hgr2rgb.vcxproj
index f42e138..f4e7368 100644
--- a/hgr2tga.vcxproj
+++ b/hgr2rgb.vcxproj
@@ -14,6 +14,7 @@
     <ProjectGuid>{3D05589D-6761-4225-9719-817919B75BEE}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>hgr2tga</RootNamespace>
+    <ProjectName>hgr2rgb</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -70,7 +71,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <WarningLevel>EnableAllWarnings</WarningLevel>
+      <WarningLevel>Level3</WarningLevel>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -83,7 +84,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <OutputFile>bin\$(TargetName)$(TargetExt)</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
     </Link>
     <CustomBuildStep>
       <Command>cmd.exe /k copy "$(OutDir)$(TargetName)$(TargetExt)" "bin\$(TargetName)$(TargetExt)"</Command>
@@ -93,7 +94,15 @@
     </CustomBuildStep>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="src\cs.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="src\main.cpp" />
+    <ClCompile Include="src\wsvideo.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\cs.h" />
diff --git a/hgr2rgb.vcxproj.filters b/hgr2rgb.vcxproj.filters
new file mode 100644
index 0000000..89ff943
--- /dev/null
+++ b/hgr2rgb.vcxproj.filters
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+    <Filter Include="Source %28exclude%29">
+      <UniqueIdentifier>{f1d9597b-1e62-4de2-98ce-473890543dcd}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="src\main.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cs.cpp">
+      <Filter>Source %28exclude%29</Filter>
+    </ClCompile>
+    <ClCompile Include="src\wsvideo.cpp">
+      <Filter>Source %28exclude%29</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="src\cs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\StdAfx.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\wsvideo.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/test.sh b/test.sh
index aaf42f4..a8c7b76 100755
--- a/test.sh
+++ b/test.sh
@@ -1,3 +1,5 @@
 #!/bin/sh
-bin/hgr2rgb.x hgr/archon.hgr2
+bin/hgr2rgb.x -tga hgr/archon.hgr2
+bin/hgr2rgb.x -bmp hgr/archon.hgr2
+