atlex and MSICALib are now submodules as they require the same build settings (property pages) as MSICA itself

This commit is contained in:
Simon Rozman 2016-03-11 14:19:30 +01:00
parent 9e76c649e6
commit 71c6074b76
6 changed files with 12 additions and 4 deletions

6
.gitmodules vendored Normal file
View File

@ -0,0 +1,6 @@
[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

View File

@ -1,9 +1,9 @@
 
Microsoft Visual Studio Solution File, Format Version 11.00 Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010 # 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 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 EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSICA", "MSICA\MSICA.vcxproj", "{A7D9EBC1-1E64-4399-9C88-6692F8742153}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSICA", "MSICA\MSICA.vcxproj", "{A7D9EBC1-1E64-4399-9C88-6692F8742153}"
EndProject EndProject

View File

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

View File

@ -103,7 +103,7 @@
<ResourceCompile Include="MSICA.rc" /> <ResourceCompile Include="MSICA.rc" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\lib\MSICALib\build\MSICALib.vcxproj"> <ProjectReference Include="..\lib\MSICALib\build\MSICALib.vcxproj">
<Project>{8552ee55-177e-4f51-b51b-baf7d6462cde}</Project> <Project>{8552ee55-177e-4f51-b51b-baf7d6462cde}</Project>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>

1
lib/MSICALib Submodule

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

1
lib/atlex Submodule

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