From 2eb6b2a3117c7637f81eb5af92057cd8354c693a Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Fri, 31 Aug 2018 13:49:18 +0200
Subject: [PATCH] Redesign the project files

---
 build/MSICALib.props   | 22 ++++++++++++++++++++--
 build/MSICALib.vcxproj | 27 ---------------------------
 2 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/build/MSICALib.props b/build/MSICALib.props
index 51dd834..c4db279 100644
--- a/build/MSICALib.props
+++ b/build/MSICALib.props
@@ -18,7 +18,10 @@
     along with MSICA. If not, see <http://www.gnu.org/licenses/>.
 -->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
+  <ImportGroup Label="PropertySheets">
+    <Import Project="..\..\..\include\$(Platform).props" />
+    <Import Project="..\..\..\include\$(Configuration).props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <OutDir>temp\$(ProjectName).$(Platform).$(Configuration)\</OutDir>
@@ -44,5 +47,20 @@
       <LinkTimeCodeGeneration>false</LinkTimeCodeGeneration>
     </Lib>
   </ItemDefinitionGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <ClCompile Include="..\src\OpCert.cpp" />
+    <ClCompile Include="..\src\MSICALib.cpp" />
+    <ClCompile Include="..\src\OpFile.cpp" />
+    <ClCompile Include="..\src\OpSvc.cpp" />
+    <ClCompile Include="..\src\OpTS.cpp" />
+    <ClCompile Include="..\src\OpReg.cpp" />
+    <ClCompile Include="..\src\OpWLAN.cpp" />
+    <ClCompile Include="..\src\stdafx.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\include\MSICALib.h" />
+    <ClInclude Include="..\src\stdafx.h" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/build/MSICALib.vcxproj b/build/MSICALib.vcxproj
index c772b97..51fb705 100644
--- a/build/MSICALib.vcxproj
+++ b/build/MSICALib.vcxproj
@@ -46,51 +46,24 @@
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\Win32.props" />
-    <Import Project="..\..\..\include\Release.props" />
     <Import Project="MSICALib.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\Win32.props" />
-    <Import Project="..\..\..\include\Debug.props" />
     <Import Project="MSICALib.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\x64.props" />
-    <Import Project="..\..\..\include\Release.props" />
     <Import Project="MSICALib.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\x64.props" />
-    <Import Project="..\..\..\include\Debug.props" />
     <Import Project="MSICALib.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
   </PropertyGroup>
-  <ItemGroup>
-    <ClCompile Include="..\src\OpCert.cpp" />
-    <ClCompile Include="..\src\MSICALib.cpp" />
-    <ClCompile Include="..\src\OpFile.cpp" />
-    <ClCompile Include="..\src\OpSvc.cpp" />
-    <ClCompile Include="..\src\OpTS.cpp" />
-    <ClCompile Include="..\src\OpReg.cpp" />
-    <ClCompile Include="..\src\OpWLAN.cpp" />
-    <ClCompile Include="..\src\stdafx.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\include\MSICALib.h" />
-    <ClInclude Include="..\src\stdafx.h" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>