Project reorganization

.gitattributes

@@ -13,23 +13,6 @@ MSICA/res/MSICA.rc -text svneol=unset#unset
 MSICA/res/MSICA.rcx -text svneol=unset#unset
 MSICA/stdafx.cpp -text
 MSICA/stdafx.h -text
-MSICALib/L10N/sl_SI.po -text
-MSICALib/MSIBuild/Makefile -text
-MSICALib/MSIBuild/build_all.bat -text
-MSICALib/MSIBuild/clean_all.bat -text
-MSICALib/MSICALib.cpp -text
-MSICALib/MSICALib.h -text
-MSICALib/MSICALib.vcxproj -text svneol=unset#text/xml
-MSICALib/MSICALib.vcxproj.filters -text svneol=unset#text/xml
-MSICALib/OpCert.cpp -text
-MSICALib/OpFile.cpp -text
-MSICALib/OpReg.cpp -text
-MSICALib/OpSvc.cpp -text
-MSICALib/OpTS.cpp -text
-MSICALib/OpWLAN.cpp -text
-MSICALib/stdafx.cpp -text
-MSICALib/stdafx.h -text
-/TODO.rtf -text svneol=unset#text/rtf
 include/Debug.props -text svneol=unset#text/xml
 include/Release.props -text svneol=unset#text/xml
 include/Win32.props -text svneol=unset#text/xml

.gitignore

@@ -1,17 +1,17 @@
 /*.opensdf
 /*.sdf
 /*.suo
-MSICA/*.user
+build/*.user
-MSICA/L10N/*.mo
+build/temp
-MSICA/MSIBuild/*-1.idt
+L10N/*.mo
-MSICA/MSIBuild/*-2.idt
+MSIBuild/*-1.idt
-MSICA/MSIBuild/*-2.idtx
+MSIBuild/*-2.idt
-MSICA/MSIBuild/*.Binary-1
+MSIBuild/*-2.idtx
-MSICA/MSIBuild/*.Binary-2
+MSIBuild/*.Binary-1
-MSICA/MSIBuild/*.Icon-1
+MSIBuild/*.Binary-2
-MSICA/MSIBuild/*.Icon-2
+MSIBuild/*.Icon-1
-MSICA/MSIBuild/*.lst
+MSIBuild/*.Icon-2
-MSICA/MSIBuild/*.msm
+MSIBuild/*.lst
-MSICA/temp
+MSIBuild/*.msm
 /ipch
 /output

.gitmodules

@@ -1,6 +0,0 @@
-[submodule "lib/atlex"]
-	path = lib/atlex
-	url = https://github.com/Amebis/atlex.git
-[submodule "lib/MSICALib"]
-	path = lib/MSICALib
-	url = https://github.com/Amebis/MSICALib.git

MSIBuild/Makefile

@@ -17,7 +17,7 @@
 #    along with MSICA. If not, see <http://www.gnu.org/licenses/>.
 #
 
-!INCLUDE "..\..\..\include\MSIBuildCfg.mak"
+!INCLUDE "..\..\include\MSIBuildCfg.mak"
 
 MSIBUILD_IS_LOCALIZEABLE=1
 
@@ -27,7 +27,7 @@ MSIBUILD_IS_LOCALIZEABLE=1
 
 All :: "$(LANG).$(PLAT).$(CFG)._Validation-1.idt"
 
-"$(LANG).$(PLAT).$(CFG)._Validation-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
+"$(LANG).$(PLAT).$(CFG)._Validation-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Table	Column	Nullable	MinValue	MaxValue	KeyTable	KeyColumn	Category	Set	Description
@@ -91,7 +91,7 @@ WLANProfile	Component_	N			Component	1	Identifier		Component the profile is part
 
 All :: "$(LANG).$(PLAT).$(CFG).ActionText-2.idt"
 
-"En.$(PLAT).$(CFG).ActionText-2.idtx" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
+"En.$(PLAT).$(CFG).ActionText-2.idtx" : "Makefile" "..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Action	Description	Template
@@ -128,7 +128,7 @@ All :: \
 	"$(LANG).$(PLAT).$(CFG).Binary-1.idt" \
 	"$(LANG).$(PLAT).$(CFG).Binary-1\MSICA.dll"
 
-"$(LANG).$(PLAT).$(CFG).Binary-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak" "$(LANG).$(PLAT).$(CFG).Binary-1"
+"$(LANG).$(PLAT).$(CFG).Binary-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak" "$(LANG).$(PLAT).$(CFG).Binary-1"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Name	Data
@@ -137,7 +137,7 @@ Binary	Name
 binMSICA.dll	MSICA.dll
 <<NOKEEP
 
-"$(LANG).$(PLAT).$(CFG).Binary-1\MSICA.dll" : "..\..\output\$(PLAT).$(CFG)\MSICA.dll"
+"$(LANG).$(PLAT).$(CFG).Binary-1\MSICA.dll" : "..\output\$(PLAT).$(CFG)\MSICA.dll"
 	copy /y $** $@ > NUL
 
 
@@ -146,7 +146,7 @@ binMSICA.dll	MSICA.dll
 #
 #All :: "$(LANG).$(PLAT).$(CFG).Certificate-1.idt"
 #
-#"$(LANG).$(PLAT).$(CFG).Certificate-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
+#"$(LANG).$(PLAT).$(CFG).Certificate-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
 #	-if exist $@ del /f /q $@
 #	move /y << $@ > NUL
 #Certificate	Store	Flags	Encoding	Binary_	Condition	Component_
@@ -160,7 +160,7 @@ binMSICA.dll	MSICA.dll
 
 All :: "$(LANG).$(PLAT).$(CFG).CustomAction-1.idt"
 
-"$(LANG).$(PLAT).$(CFG).CustomAction-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
+"$(LANG).$(PLAT).$(CFG).CustomAction-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Action	Type	Source	Target
@@ -202,7 +202,7 @@ InstallScheduledTasksCommit	3585	binMSICA.dll	ExecuteSequence
 
 All :: "$(LANG).$(PLAT).$(CFG).InstallExecuteSequence-1.idt"
 
-"$(LANG).$(PLAT).$(CFG).InstallExecuteSequence-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
+"$(LANG).$(PLAT).$(CFG).InstallExecuteSequence-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Action	Condition	Sequence
@@ -244,7 +244,7 @@ InstallScheduledTasksCommit		6164
 #
 #All :: "$(LANG).$(PLAT).$(CFG).ScheduledTask-1.idt"
 #
-#"$(LANG).$(PLAT).$(CFG).ScheduledTask-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
+#"$(LANG).$(PLAT).$(CFG).ScheduledTask-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
 #	-if exist $@ del /f /q $@
 #	move /y << $@ > NUL
 #Task	DisplayName	Application	Parameters	Directory_	Flags	Priority	User	Password	Author	Description	IdleMin	IdleDeadline	MaxRuntime	Condition	Component_
@@ -258,7 +258,7 @@ InstallScheduledTasksCommit		6164
 #
 #All :: "$(LANG).$(PLAT).$(CFG).ServiceConfigure-1.idt"
 #
-#"$(LANG).$(PLAT).$(CFG).ServiceConfigure-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
+#"$(LANG).$(PLAT).$(CFG).ServiceConfigure-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
 #	-if exist $@ del /f /q $@
 #	move /y << $@ > NUL
 #ServiceConfigure	Name	StartType	Control	Condition	Sequence
@@ -272,7 +272,7 @@ InstallScheduledTasksCommit		6164
 #
 #All :: "$(LANG).$(PLAT).$(CFG).TaskTrigger-1.idt"
 #
-#"$(LANG).$(PLAT).$(CFG).TaskTrigger-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
+#"$(LANG).$(PLAT).$(CFG).TaskTrigger-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
 #	-if exist $@ del /f /q $@
 #	move /y << $@ > NUL
 #Trigger	BeginDate	EndDate	StartTime	StartTimeRand	MinutesDuration	MinutesInterval	Flags	Type	DaysInterval	WeeksInterval	DaysOfTheWeek	DaysOfMonth	WeekOfMonth	MonthsOfYear	Task_
@@ -286,7 +286,7 @@ InstallScheduledTasksCommit		6164
 #
 #All :: "$(LANG).$(PLAT).$(CFG).WLANProfile-1.idt"
 #
-#"$(LANG).$(PLAT).$(CFG).WLANProfile-1.idt" : "Makefile" "..\..\..\include\MSIBuildCfg.mak"
+#"$(LANG).$(PLAT).$(CFG).WLANProfile-1.idt" : "Makefile" "..\..\include\MSIBuildCfg.mak"
 #	-if exist $@ del /f /q $@
 #	move /y << $@ > NUL
 #WLANProfile	Name	Binary_	Condition	Component_
@@ -299,4 +299,4 @@ InstallScheduledTasksCommit		6164
 # Build MSM module!
 ######################################################################
 
-!INCLUDE "..\..\..\MSIBuild\MSM.mak"
+!INCLUDE "..\..\MSIBuild\MSM.mak"

MSICA.sln

@@ -1,11 +1,11 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atlex", "lib\atlex\build\atlex.vcxproj", "{5A4EADF2-3237-457A-9DA8-BB9942A91019}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atlex", "..\..\lib\atlex\build\atlex.vcxproj", "{5A4EADF2-3237-457A-9DA8-BB9942A91019}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSICALib", "lib\MSICALib\build\MSICALib.vcxproj", "{8552EE55-177E-4F51-B51B-BAF7D6462CDE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSICALib", "..\..\lib\MSICALib\build\MSICALib.vcxproj", "{8552EE55-177E-4F51-B51B-BAF7D6462CDE}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSICA", "MSICA\MSICA.vcxproj", "{A7D9EBC1-1E64-4399-9C88-6692F8742153}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSICA", "build\MSICA.vcxproj", "{A7D9EBC1-1E64-4399-9C88-6692F8742153}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{26350A68-2F55-4732-972C-4A5E9077699E}"
 EndProject

build/MSICA.props

@@ -14,8 +14,11 @@
       <LanguageCatalogs>L10N\sl_SI.po</LanguageCatalogs>
     </ResourceLocalizator>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\lib\MSICALib\include;..\lib\atlex\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\..\..\lib\MSICALib\include;..\..\..\lib\atlex\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
+    <ResourceCompile>
+      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup />
 </Project>

build/MSICA.vcxproj

@@ -49,26 +49,26 @@
   <ImportGroup Label="ExtensionSettings" />
   <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\Win32.props" />
-    <Import Project="..\include\Release.props" />
+    <Import Project="..\..\..\include\Release.props" />
     <Import Project="MSICA.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\Win32.props" />
-    <Import Project="..\include\Debug.props" />
+    <Import Project="..\..\..\include\Debug.props" />
     <Import Project="MSICA.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\x64.props" />
-    <Import Project="..\include\Release.props" />
+    <Import Project="..\..\..\include\Release.props" />
     <Import Project="MSICA.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\x64.props" />
-    <Import Project="..\include\Debug.props" />
+    <Import Project="..\..\..\include\Debug.props" />
     <Import Project="MSICA.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
@@ -80,8 +80,8 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
   <ItemGroup>
-    <ClCompile Include="MSICA.cpp" />
+    <ClCompile Include="..\src\MSICA.cpp" />
-    <ClCompile Include="stdafx.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>
@@ -89,17 +89,17 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="MSICA.h" />
+    <ClInclude Include="..\include\MSICA.h" />
-    <ClInclude Include="stdafx.h" />
+    <ClInclude Include="..\src\stdafx.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="L10N\sl_SI.po" />
+    <None Include="..\L10N\sl_SI.po" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="MSICA.rc" />
+    <ResourceCompile Include="..\res\MSICA.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\lib\MSICALib\build\MSICALib.vcxproj">
+    <ProjectReference Include="..\..\..\lib\MSICALib\build\MSICALib.vcxproj">
       <Project>{8552ee55-177e-4f51-b51b-baf7d6462cde}</Project>
     </ProjectReference>
   </ItemGroup>

build/MSICA.vcxproj.filters

@@ -15,28 +15,28 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="MSICA.cpp">
+    <ClCompile Include="..\src\MSICA.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="stdafx.cpp">
+    <ClCompile Include="..\src\stdafx.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="MSICA.h">
+    <ClInclude Include="..\include\MSICA.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="stdafx.h">
+    <ClInclude Include="..\src\stdafx.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="L10N\sl_SI.po">
+    <None Include="..\L10N\sl_SI.po">
       <Filter>Resource Files</Filter>
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="MSICA.rc">
+    <ResourceCompile Include="..\res\MSICA.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>

include/Debug.props

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_PropertySheetDisplayName>MSICA Debug</_PropertySheetDisplayName>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <SmallerTypeCheck>true</SmallerTypeCheck>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-  <Target Name="Sign" Condition="'$(ManifestCertificateThumbprint)' != '' and ('$(ConfigurationType)' == 'Application' or '$(ConfigurationType)' == 'DynamicLibrary')" AfterTargets="_Manifest" BeforeTargets="RegisterOutput" Inputs="$(OutDir)$(TargetName)$(TargetExt)" Outputs="$(IntDir)$(TargetName).sign">
-    <Message Text="Signing output file..." />
-    <SignFile CertificateThumbprint="$(ManifestCertificateThumbprint)" SigningTarget="$(OutDir)$(TargetName)$(TargetExt)" />
-    <Touch Files="$(IntDir)$(TargetName).sign" AlwaysCreate="true" />
-  </Target>
-</Project>

include/Release.props

@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_PropertySheetDisplayName>MSICA Release</_PropertySheetDisplayName>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <OmitFramePointers>true</OmitFramePointers>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-  <Target Name="Sign" Condition="'$(ManifestCertificateThumbprint)' != '' and ('$(ConfigurationType)' == 'Application' or '$(ConfigurationType)' == 'DynamicLibrary')" AfterTargets="_Manifest" BeforeTargets="RegisterOutput" Inputs="$(OutDir)$(TargetName)$(TargetExt)" Outputs="$(IntDir)$(TargetName).sign">
-    <Message Text="Signing output file..." />
-    <SignFile CertificateThumbprint="$(ManifestCertificateThumbprint)" TimestampUrl="$(ManifestTimestampUrl)" SigningTarget="$(OutDir)$(TargetName)$(TargetExt)" />
-    <Touch Files="$(IntDir)$(TargetName).sign" AlwaysCreate="true" />
-  </Target>
-</Project>

include/Win32.props

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets">
-    <Import Project="common.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_PropertySheetDisplayName>MSICA Win32</_PropertySheetDisplayName>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <Lib>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Lib>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>

include/common.props

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <IntDir>temp\$(ProjectName).$(Platform).$(Configuration)\</IntDir>
-    <_PropertySheetDisplayName>MSICA Common</_PropertySheetDisplayName>
-    <OutDir>temp\$(ProjectName).$(Platform).$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>WIN32;STRICT;VC_EXTRALEAN;_WIN32_WINNT=0x0501;_WINSOCKAPI_;_ATL_APARTMENT_THREADED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <StringPooling>true</StringPooling>
-    </ClCompile>
-    <Link>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>

include/x64.props

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets">
-    <Import Project="common.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_PropertySheetDisplayName>MSICA x64</_PropertySheetDisplayName>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <Lib>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Lib>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>

lib/MSICALib

@@ -1 +0,0 @@
-Subproject commit fc7c3365bafd09a2b4211ce1dc4a922dde1be37c

lib/atlex

@@ -1 +0,0 @@
-Subproject commit b04fe38b3f8956946b2b1961156f39dbac114424

src/stdafx.h

@@ -41,4 +41,4 @@ extern DWORD (WINAPI *pfnWlanEnumInterfaces)(__in HANDLE hClientHandle, __reserv
 
 #include <MSICALib.h>
 
-#include "MSICA.h"
+#include <MSICA.h>