summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorevoskuil <eric@voskuil.org>2014-04-15 23:44:28 (GMT)
committer evoskuil <eric@voskuil.org>2014-04-15 23:44:28 (GMT)
commit4e3e4eb748e246653a01c17d2a5ea967c15cbdf3 (patch)
tree6fee2c51e6c263053ef5a5417b2e3be1fd678934
parentf09808ca0e647eee9966690b5c297a0aa35fb8bc (diff)
parentb4d7fe29fb6c432d920ddfee651a639d5e7322cf (diff)
Merge pull request #12 from evoskuil/master
Update Visual Studio project config.
-rw-r--r--builds/msvc/.gitignore (renamed from builds/msvc/vs2013/.gitignore)4
-rw-r--r--builds/msvc/vs2013/libbitcoin.import.props79
-rw-r--r--builds/msvc/vs2013/libbitcoin.import.xml34
-rw-r--r--builds/msvc/vs2013/obelisk.import.props77
-rw-r--r--builds/msvc/vs2013/obelisk.import.xml17
-rw-r--r--builds/msvc/vs2013/obelisk/.gitignore5
-rw-r--r--builds/msvc/vs2013/obelisk/obelisk.props70
-rw-r--r--builds/msvc/vs2013/obelisk/obelisk.vcxproj57
-rw-r--r--builds/msvc/vs2013/obelisk/obelisk.vcxproj.filters2
-rw-r--r--builds/msvc/vs2013/obelisk/packages.config6
-rw-r--r--builds/msvc/vs2013/properties/Common.props5
-rw-r--r--builds/msvc/vs2013/properties/Debug.props4
-rw-r--r--builds/msvc/vs2013/properties/Dynamic.props3
-rw-r--r--builds/msvc/vs2013/properties/DynamicDebug.props4
-rw-r--r--builds/msvc/vs2013/properties/DynamicRelease.props3
-rw-r--r--builds/msvc/vs2013/properties/LinkTimeCodeGeneration.props6
-rw-r--r--builds/msvc/vs2013/properties/Release.props3
-rw-r--r--builds/msvc/vs2013/properties/Static.props3
-rw-r--r--builds/msvc/vs2013/properties/StaticDebug.props4
-rw-r--r--builds/msvc/vs2013/properties/StaticDebugLinkTimeCodeGeneration.props4
-rw-r--r--builds/msvc/vs2013/properties/StaticLinkTimeCodeGeneration.props3
-rw-r--r--builds/msvc/vs2013/properties/StaticRelease.props3
-rw-r--r--builds/msvc/vs2013/properties/StaticReleaseLinkTimeCodeGeneration.props3
-rw-r--r--builds/msvc/vs2013/properties/Win32.props3
-rw-r--r--builds/msvc/vs2013/properties/x64.props3
25 files changed, 300 insertions, 105 deletions
diff --git a/builds/msvc/vs2013/.gitignore b/builds/msvc/.gitignore
index c4e9041..6e9d3f3 100644
--- a/builds/msvc/vs2013/.gitignore
+++ b/builds/msvc/.gitignore
@@ -1,3 +1,5 @@
-*.v12.suo
+*.suo
*.opensdf
*.sdf
+*.user
+
diff --git a/builds/msvc/vs2013/libbitcoin.import.props b/builds/msvc/vs2013/libbitcoin.import.props
new file mode 100644
index 0000000..4b0a573
--- /dev/null
+++ b/builds/msvc/vs2013/libbitcoin.import.props
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+ <PropertyGroup Label="Globals">
+ <_PropertySheetDisplayName>Libbitcoin Import Settings</_PropertySheetDisplayName>
+ </PropertyGroup>
+
+ <!-- User Interface -->
+
+ <ItemGroup Label="BuildOptionsExtension">
+ <PropertyPageSchema Include="$(MSBuildThisFileDirectory)libbitcoin.import.xml" />
+ </ItemGroup>
+
+ <!-- Configuration -->
+
+ <ItemDefinitionGroup>
+ <ClCompile>
+ <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libbitcoin\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="'$(Option-testnet)' == 'true'">ENABLE_TESTNET;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Option-leveldb)' == 'true'">LEVELDB_ENABLED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="$(Configuration.IndexOf('Release')) != -1">BITCOIN_DISABLE_ASSERTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Linkage-libbitcoin)' == 'static' Or '$(Linkage-libbitcoin)' == 'ltcg'">BC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ </ItemDefinitionGroup>
+
+ <!-- Linkage -->
+
+ <ItemDefinitionGroup Condition="'$(Linkage-libbitcoin)' == 'dynamic'">
+ <Link Condition="$(Configuration.IndexOf('Debug')) != -1">
+ <AdditionalDependencies>$(ProjectDir)..\..\..\..\..\libbitcoin\bin\$(PlatformName)\Debug\libbitcoin12\libbitcoin.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ <Link Condition="$(Configuration.IndexOf('Release')) != -1">
+ <AdditionalDependencies>$(ProjectDir)..\..\..\..\..\libbitcoin\bin\$(PlatformName)\Release\libbitcoin12\libbitcoin.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+
+ <ItemDefinitionGroup Condition="'$(Linkage-libbitcoin)' == 'static'">
+ <Link Condition="$(Configuration.IndexOf('Debug')) != -1">
+ <AdditionalDependencies>$(ProjectDir)..\..\..\..\..\libbitcoin\bin\$(PlatformName)\Debug\libbitcoin12\libbitcoin.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ <Link Condition="$(Configuration.IndexOf('Release')) != -1">
+ <AdditionalDependencies>$(ProjectDir)..\..\..\..\..\libbitcoin\bin\$(PlatformName)\Release\libbitcoin12\libbitcoin.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+
+ <ItemDefinitionGroup Condition="'$(Linkage-libbitcoin)' == 'ltcg'">
+ <Link Condition="$(Configuration.IndexOf('Debug')) != -1">
+ <AdditionalDependencies>$(ProjectDir)..\..\..\..\..\libbitcoin\bin\$(PlatformName)\Debug\libbitcoin12\libbitcoin.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ <Link Condition="$(Configuration.IndexOf('Release')) != -1">
+ <AdditionalDependencies>$(ProjectDir)..\..\..\..\..\libbitcoin\bin\$(PlatformName)\Release\libbitcoin12\libbitcoin.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+
+ <!-- Copy -->
+
+ <Target Name="Linkage-libbitcoin-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libbitcoin)' == 'dynamic'">
+ <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
+ SourceFiles="$(ProjectDir)..\..\..\..\..\libbitcoin\bin\$(PlatformName)\Debug\libbitcoin12\libbitcoin.dll"
+ DestinationFiles="$(TargetDir)libbitcoin.dll"
+ SkipUnchangedFiles="true" />
+ <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
+ SourceFiles="$(ProjectDir)..\..\..\..\..\libbitcoin\bin\$(PlatformName)\Debug\libbitcoin12\libbitcoin.pdb"
+ DestinationFiles="$(TargetDir)libbitcoin.pdb"
+ SkipUnchangedFiles="true" />
+ <Copy Condition="$(Configuration.IndexOf('Release')) != -1"
+ SourceFiles="$(ProjectDir)..\..\..\..\..\libbitcoin\bin\$(PlatformName)\Release\libbitcoin12\libbitcoin.dll"
+ DestinationFiles="$(TargetDir)libbitcoin.dll"
+ SkipUnchangedFiles="true" />
+ </Target>
+
+ <!-- Messages -->
+
+ <Target Name="libbitcoin-info" BeforeTargets="AfterBuild" Condition="'$(Linkage-libbitcoin)' == 'dynamic'">
+ <Message Text="Copying libbitcoin.dll -&gt; $(TargetDir)libbitcoin.dll" Importance="high"/>
+ <Message Text="Copying libbitcoin.pdb -&gt; $(TargetDir)libbitcoin.pdb" Importance="high" Condition="$(Configuration.IndexOf('Debug')) != -1" />
+ </Target>
+
+</Project> \ No newline at end of file
diff --git a/builds/msvc/vs2013/libbitcoin.import.xml b/builds/msvc/vs2013/libbitcoin.import.xml
new file mode 100644
index 0000000..1baa1b7
--- /dev/null
+++ b/builds/msvc/vs2013/libbitcoin.import.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
+ <Rule Name="libbitcoin-options-uiextension" PageTemplate="tool" DisplayName="Bitcoin Options" SwitchPrefix="/" Order="1">
+ <Rule.Categories>
+ <Category Name="leveldb" DisplayName="leveldb" />
+ <Category Name="testnet" DisplayName="testnet" />
+ </Rule.Categories>
+ <Rule.DataSource>
+ <DataSource Persistence="ProjectFile" ItemType="" />
+ </Rule.DataSource>
+ <EnumProperty Name="Option-leveldb" DisplayName="Enable LevelDB" Description="Enable the LevelDB build option" Category="leveldb">
+ <EnumValue Name="" DisplayName="No" />
+ <EnumValue Name="true" DisplayName="Yes" />
+ </EnumProperty>
+ <EnumProperty Name="Option-testnet" DisplayName="Enable Testnet" Description="Enable the Testnet build option" Category="testnet">
+ <EnumValue Name="" DisplayName="No" />
+ <EnumValue Name="true" DisplayName="Yes" />
+ </EnumProperty>
+ </Rule>
+ <Rule Name="libbitcoin-linkage-uiextension" PageTemplate="tool" DisplayName="Local Dependencies" SwitchPrefix="/" Order="1">
+ <Rule.Categories>
+ <Category Name="libbitcoin" DisplayName="libbitcoin" />
+ </Rule.Categories>
+ <Rule.DataSource>
+ <DataSource Persistence="ProjectFile" ItemType="" />
+ </Rule.DataSource>
+ <EnumProperty Name="Linkage-libbitcoin" DisplayName="Linkage" Description="How libbitcoin will be linked into the output of this project" Category="libbitcoin">
+ <EnumValue Name="" DisplayName="Not linked" />
+ <EnumValue Name="dynamic" DisplayName="Dynamic (DLL)" />
+ <EnumValue Name="static" DisplayName="Static (LIB)" />
+ <EnumValue Name="ltcg" DisplayName="Static using link time compile generation (LTCG)" />
+ </EnumProperty>
+ </Rule>
+</ProjectSchemaDefinitions> \ No newline at end of file
diff --git a/builds/msvc/vs2013/obelisk.import.props b/builds/msvc/vs2013/obelisk.import.props
new file mode 100644
index 0000000..4baef0b
--- /dev/null
+++ b/builds/msvc/vs2013/obelisk.import.props
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+ <PropertyGroup Label="Globals">
+ <_PropertySheetDisplayName>Obelisk Import Settings</_PropertySheetDisplayName>
+ </PropertyGroup>
+
+ <!-- User Interface -->
+
+ <ItemGroup Label="BuildOptionsExtension">
+ <PropertyPageSchema Include="$(MSBuildThisFileDirectory)obelisk.import.xml" />
+ </ItemGroup>
+
+ <!-- Configuration -->
+
+ <ItemDefinitionGroup>
+ <ClCompile>
+ <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\obelisk\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions Condition="$(Configuration.IndexOf('Release')) != -1">BITCOIN_DISABLE_ASSERTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(Linkage-obelisk)' == 'static' Or '$(Linkage-obelisk)' == 'ltcg'">OBELISK_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ </ItemDefinitionGroup>
+
+ <!-- Linkage -->
+
+ <ItemDefinitionGroup Condition="'$(Linkage-obelisk)' == 'dynamic'">
+ <Link Condition="$(Configuration.IndexOf('Debug')) != -1">
+ <AdditionalDependencies>$(ProjectDir)..\..\..\..\..\obelisk\bin\$(PlatformName)\Debug\obelisk12\obelisk.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ <Link Condition="$(Configuration.IndexOf('Release')) != -1">
+ <AdditionalDependencies>$(ProjectDir)..\..\..\..\..\obelisk\bin\$(PlatformName)\Release\obelisk12\obelisk.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+
+ <ItemDefinitionGroup Condition="'$(Linkage-obelisk)' == 'static'">
+ <Link Condition="$(Configuration.IndexOf('Debug')) != -1">
+ <AdditionalDependencies>$(ProjectDir)..\..\..\..\..\obelisk\bin\$(PlatformName)\Debug\obelisk12\obelisk.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ <Link Condition="$(Configuration.IndexOf('Release')) != -1">
+ <AdditionalDependencies>$(ProjectDir)..\..\..\..\..\obelisk\bin\$(PlatformName)\Release\obelisk12\obelisk.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+
+ <ItemDefinitionGroup Condition="'$(Linkage-obelisk)' == 'ltcg'">
+ <Link Condition="$(Configuration.IndexOf('Debug')) != -1">
+ <AdditionalDependencies>$(ProjectDir)..\..\..\..\..\obelisk\bin\$(PlatformName)\Debug\obelisk12\obelisk.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ <Link Condition="$(Configuration.IndexOf('Release')) != -1">
+ <AdditionalDependencies>$(ProjectDir)..\..\..\..\..\obelisk\bin\$(PlatformName)\Release\obelisk12\obelisk.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+
+ <!-- Copy -->
+
+ <Target Name="Linkage-obelisk-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-obelisk)' == 'dynamic'">
+ <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
+ SourceFiles="$(ProjectDir)..\..\..\..\..\obelisk\bin\$(PlatformName)\Debug\obelisk12\obelisk.dll"
+ DestinationFiles="$(TargetDir)obelisk.dll"
+ SkipUnchangedFiles="true" />
+ <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
+ SourceFiles="$(ProjectDir)..\..\..\..\..\obelisk\bin\$(PlatformName)\Debug\obelisk12\obelisk.pdb"
+ DestinationFiles="$(TargetDir)obelisk.pdb"
+ SkipUnchangedFiles="true" />
+ <Copy Condition="$(Configuration.IndexOf('Release')) != -1"
+ SourceFiles="$(ProjectDir)..\..\..\..\..\obelisk\bin\$(PlatformName)\Release\obelisk12\obelisk.dll"
+ DestinationFiles="$(TargetDir)obelisk.dll"
+ SkipUnchangedFiles="true" />
+ </Target>
+
+ <!-- Messages -->
+
+ <Target Name="obelisk-info" BeforeTargets="AfterBuild" Condition="'$(Linkage-obelisk)' == 'dynamic'">
+ <Message Text="Copying obelisk.dll -&gt; $(TargetDir)obelisk.dll" Importance="high"/>
+ <Message Text="Copying obelisk.pdb -&gt; $(TargetDir)obelisk.pdb" Importance="high" Condition="$(Configuration.IndexOf('Debug')) != -1" />
+ </Target>
+
+</Project> \ No newline at end of file
diff --git a/builds/msvc/vs2013/obelisk.import.xml b/builds/msvc/vs2013/obelisk.import.xml
new file mode 100644
index 0000000..f90f176
--- /dev/null
+++ b/builds/msvc/vs2013/obelisk.import.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
+ <Rule Name="obelisk-linkage-uiextension" PageTemplate="tool" DisplayName="Local Dependencies" SwitchPrefix="/" Order="1">
+ <Rule.Categories>
+ <Category Name="obelisk" DisplayName="obelisk" />
+ </Rule.Categories>
+ <Rule.DataSource>
+ <DataSource Persistence="ProjectFile" ItemType="" />
+ </Rule.DataSource>
+ <EnumProperty Name="Linkage-obelisk" DisplayName="Linkage" Description="How obelisk will be linked into the output of this project" Category="obelisk">
+ <EnumValue Name="" DisplayName="Not linked" />
+ <EnumValue Name="dynamic" DisplayName="Dynamic (DLL)" />
+ <EnumValue Name="static" DisplayName="Static (LIB)" />
+ <EnumValue Name="ltcg" DisplayName="Static using link time compile generation (LTCG)" />
+ </EnumProperty>
+ </Rule>
+</ProjectSchemaDefinitions> \ No newline at end of file
diff --git a/builds/msvc/vs2013/obelisk/.gitignore b/builds/msvc/vs2013/obelisk/.gitignore
deleted file mode 100644
index 1932413..0000000
--- a/builds/msvc/vs2013/obelisk/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-*.vcxproj.user
-*.v12.suo
-*.sdf
-*.opensdf
-*.dgml
diff --git a/builds/msvc/vs2013/obelisk/obelisk.props b/builds/msvc/vs2013/obelisk/obelisk.props
index 47cfa0f..caa0655 100644
--- a/builds/msvc/vs2013/obelisk/obelisk.props
+++ b/builds/msvc/vs2013/obelisk/obelisk.props
@@ -1,41 +1,77 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<_PropertySheetDisplayName>Obelisk Library Common Settings</_PropertySheetDisplayName>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<RunCodeAnalysis>false</RunCodeAnalysis>
</PropertyGroup>
+ <!-- Configuration -->
+
<ItemDefinitionGroup>
<ClCompile>
- <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\include\;%(AdditionalIncludeDirectories);$(ProjectDir)..\..\..\..\..\libbitcoin\include\;$(ProjectDir)..\..\..\..\..\czmqpp\include\;$(ProjectDir)..\..\..\..\..\czmq\include\;$(ProjectDir)..\..\..\..\..\libzmq\include\;(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\include\;(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4290;4275;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<EnablePREfast>false</EnablePREfast>
- <PreprocessorDefinitions>LEVELDB_ENABLED;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="'$(ConfigurationType)'=='StaticLibrary'">OBELISK_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="$(Configuration.IndexOf('Release')) != -1">BITCOIN_DISABLE_ASSERTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
- <Link>
- <AdditionalDependencies>libbitcoin.lib;%(AdditionalDependencies)</AdditionalDependencies>
- </Link>
</ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(ConfigurationType)'=='StaticLibrary'">
- <ClCompile>
- <PreprocessorDefinitions>LIBCONFIG_STATIC;LIBCONFIGXX_STATIC;ZMQ_STATIC;LIBCZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- </ItemDefinitionGroup>
+ <!-- Dependencies -->
+
+ <ImportGroup Label="PropertySheets">
+ <Import Project="$(SolutionDir)libbitcoin.import.props" />
+ </ImportGroup>
- <ItemDefinitionGroup Condition="$(Configuration.IndexOf('Release')) != -1">
- <ClCompile>
- <PreprocessorDefinitions>BITCOIN_DISABLE_ASSERTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- </ItemDefinitionGroup>
+ <PropertyGroup>
+ <Option-leveldb>true</Option-leveldb>
+ </PropertyGroup>
+
+ <PropertyGroup Condition="$(Configuration.IndexOf('DLL')) != -1">
+ <Linkage-zlib>dynamic</Linkage-zlib>
+ <Linkage-openssl>dynamic</Linkage-openssl>
+ <Linkage-czmqpp>dynamic</Linkage-czmqpp>
+ <Linkage-czmq>dynamic</Linkage-czmq>
+ <Linkage-libzmq>dynamic</Linkage-libzmq>
+ <Linkage-libsodium>dynamic</Linkage-libsodium>
+ <Linkage-libconfig>dynamic</Linkage-libconfig>
+ <Linkage-libbitcoin>dynamic</Linkage-libbitcoin>
+ </PropertyGroup>
+ <PropertyGroup Condition="$(Configuration.IndexOf('LTCG')) != -1">
+ <Linkage-zlib>ltcg</Linkage-zlib>
+ <Linkage-openssl>ltcg</Linkage-openssl>
+ <Linkage-czmqpp>ltcg</Linkage-czmqpp>
+ <Linkage-czmq>ltcg</Linkage-czmq>
+ <Linkage-libzmq>ltcg</Linkage-libzmq>
+ <Linkage-libsodium>ltcg</Linkage-libsodium>
+ <Linkage-libconfig>ltcg</Linkage-libconfig>
+ <Linkage-libbitcoin>ltcg</Linkage-libbitcoin>
+ </PropertyGroup>
+ <PropertyGroup Condition="$(Configuration.IndexOf('LIB')) != -1">
+ <Linkage-zlib>static</Linkage-zlib>
+ <Linkage-openssl>static</Linkage-openssl>
+ <Linkage-czmqpp>static</Linkage-czmqpp>
+ <Linkage-czmq>static</Linkage-czmq>
+ <Linkage-libzmq>static</Linkage-libzmq>
+ <Linkage-libsodium>static</Linkage-libsodium>
+ <Linkage-libconfig>static</Linkage-libconfig>
+ <Linkage-libbitcoin>static</Linkage-libbitcoin>
+ </PropertyGroup>
+
+ <!-- Messages -->
<Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
<Message Text="Linkage-libconfig : $(Linkage-libconfig)" Importance="high"/>
+ <Message Text="Linkage-czmqpp : $(Linkage-czmqpp)" Importance="high"/>
+ <Message Text="Linkage-czmq : $(Linkage-czmq)" Importance="high"/>
+ <Message Text="Linkage-libzmq : $(Linkage-libzmq)" Importance="high"/>
+ <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
<Message Text="Linkage-zlib : $(Linkage-zlib)" Importance="high"/>
<Message Text="Linkage-openssl : $(Linkage-openssl)" Importance="high"/>
+ <Message Text="Linkage-libbitcoin: $(Linkage-libbitcoin)" Importance="high"/>
</Target>
</Project>
diff --git a/builds/msvc/vs2013/obelisk/obelisk.vcxproj b/builds/msvc/vs2013/obelisk/obelisk.vcxproj
index b9617a1..40d4259 100644
--- a/builds/msvc/vs2013/obelisk/obelisk.vcxproj
+++ b/builds/msvc/vs2013/obelisk/obelisk.vcxproj
@@ -96,13 +96,13 @@
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\DynamicDebug.props" />
<Import Project="$(ProjectDir)..\properties\Win32.props" />
</ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\properties\DynamicRelease.props" />
@@ -168,46 +168,6 @@
<Import Project="$(ProjectDir)..\properties\StaticRelease.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" />
</ImportGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugLTCG|Win32'">
- <Linkage-libconfig>ltcg</Linkage-libconfig>
- <Linkage-zlib>ltcg</Linkage-zlib>
- <Linkage-openssl>ltcg</Linkage-openssl>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|Win32'">
- <Linkage-libconfig>ltcg</Linkage-libconfig>
- <Linkage-zlib>ltcg</Linkage-zlib>
- <Linkage-openssl>ltcg</Linkage-openssl>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugLTCG|x64'">
- <Linkage-libconfig>ltcg</Linkage-libconfig>
- <Linkage-zlib>ltcg</Linkage-zlib>
- <Linkage-openssl>ltcg</Linkage-openssl>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|x64'">
- <Linkage-libconfig>ltcg</Linkage-libconfig>
- <Linkage-zlib>ltcg</Linkage-zlib>
- <Linkage-openssl>ltcg</Linkage-openssl>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugLIB|Win32'">
- <Linkage-libconfig>static</Linkage-libconfig>
- <Linkage-zlib>static</Linkage-zlib>
- <Linkage-openssl>static</Linkage-openssl>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLIB|Win32'">
- <Linkage-libconfig>static</Linkage-libconfig>
- <Linkage-zlib>static</Linkage-zlib>
- <Linkage-openssl>static</Linkage-openssl>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugLIB|x64'">
- <Linkage-libconfig>static</Linkage-libconfig>
- <Linkage-zlib>static</Linkage-zlib>
- <Linkage-openssl>static</Linkage-openssl>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLIB|x64'">
- <Linkage-libconfig>static</Linkage-libconfig>
- <Linkage-zlib>static</Linkage-zlib>
- <Linkage-openssl>static</Linkage-openssl>
- </PropertyGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
@@ -255,7 +215,6 @@
<ClInclude Include="..\..\..\..\src\worker\subscribe_manager.hpp" />
<ClInclude Include="..\..\..\..\src\worker\worker.hpp" />
</ItemGroup>
- <!-- Move these? -->
<Import Project="..\..\..\..\..\..\nuget\LevelDB.1.16.0.5\build\native\LevelDB.props" Condition="Exists('..\..\..\..\..\..\nuget\LevelDB.1.16.0.5\build\native\LevelDB.props')" />
<Import Project="..\..\..\..\..\..\nuget\Snappy.1.1.1.7\build\native\Snappy.props" Condition="Exists('..\..\..\..\..\..\nuget\Snappy.1.1.1.7\build\native\Snappy.props')" />
<Import Project="..\..\..\..\..\..\nuget\Crc32C.1.0.4\build\native\Crc32C.props" Condition="Exists('..\..\..\..\..\..\nuget\Crc32C.1.0.4\build\native\Crc32C.props')" />
@@ -264,17 +223,20 @@
<ImportGroup Label="ExtensionTargets" />
<ImportGroup Label="ExtensionSettings">
<Import Project="..\..\..\..\..\..\nuget\boost.1.55.0.16\build\native\boost.targets" Condition="Exists('..\..\..\..\..\..\nuget\boost.1.55.0.16\build\native\boost.targets')" />
- <Import Project="..\..\..\..\..\..\nuget\libconfig.1.4.9.2\build\native\package.targets" Condition="Exists('..\..\..\..\..\..\nuget\libconfig.1.4.9.2\build\native\package.targets')" />
<Import Project="..\..\..\..\..\..\nuget\openssl.redist.1.0.1.24\build\native\openssl.redist.targets" Condition="Exists('..\..\..\..\..\..\nuget\openssl.redist.1.0.1.24\build\native\openssl.redist.targets')" />
<Import Project="..\..\..\..\..\..\nuget\openssl.1.0.1.24\build\native\openssl.targets" Condition="Exists('..\..\..\..\..\..\nuget\openssl.1.0.1.24\build\native\openssl.targets')" />
<Import Project="..\..\..\..\..\..\nuget\zlib.redist.1.2.8.6\build\native\zlib.redist.targets" Condition="Exists('..\..\..\..\..\..\nuget\zlib.redist.1.2.8.6\build\native\zlib.redist.targets')" />
<Import Project="..\..\..\..\..\..\nuget\zlib.1.2.8.6\build\native\zlib.targets" Condition="Exists('..\..\..\..\..\..\nuget\zlib.1.2.8.6\build\native\zlib.targets')" />
+ <Import Project="..\..\..\..\..\..\nuget\libconfig_vc120.1.4.9.4\build\native\libconfig_vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\libconfig_vc120.1.4.9.4\build\native\libconfig_vc120.targets')" />
+ <Import Project="..\..\..\..\..\..\nuget\libsodium_vc120.0.4.5.1\build\native\libsodium_vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\libsodium_vc120.0.4.5.1\build\native\libsodium_vc120.targets')" />
+ <Import Project="..\..\..\..\..\..\nuget\libzmq_vc120.4.1.0.4\build\native\libzmq_vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\libzmq_vc120.4.1.0.4\build\native\libzmq_vc120.targets')" />
+ <Import Project="..\..\..\..\..\..\nuget\czmq_vc120.2.2.0.7\build\native\czmq_vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\czmq_vc120.2.2.0.7\build\native\czmq_vc120.targets')" />
+ <Import Project="..\..\..\..\..\..\nuget\czmqpp_vc120.1.0.0.3\build\native\czmqpp_vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\czmqpp_vc120.1.0.0.3\build\native\czmqpp_vc120.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
- <Error Condition="!Exists('..\..\..\..\..\..\nuget\libconfig.1.4.9.2\build\native\package.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\libconfig.1.4.9.2\build\native\package.targets'))" />
<Error Condition="!Exists('..\..\..\..\..\..\nuget\boost.1.55.0.16\build\native\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\boost.1.55.0.16\build\native\boost.targets'))" />
<Error Condition="!Exists('..\..\..\..\..\..\nuget\openssl.redist.1.0.1.24\build\native\openssl.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\openssl.redist.1.0.1.24\build\native\openssl.redist.targets'))" />
<Error Condition="!Exists('..\..\..\..\..\..\nuget\openssl.1.0.1.24\build\native\openssl.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\openssl.1.0.1.24\build\native\openssl.props'))" />
@@ -284,5 +246,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\nuget\LevelDB.1.16.0.5\build\native\LevelDB.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\LevelDB.1.16.0.5\build\native\LevelDB.props'))" />
<Error Condition="!Exists('..\..\..\..\..\..\nuget\zlib.redist.1.2.8.6\build\native\zlib.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\zlib.redist.1.2.8.6\build\native\zlib.redist.targets'))" />
<Error Condition="!Exists('..\..\..\..\..\..\nuget\zlib.1.2.8.6\build\native\zlib.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\zlib.1.2.8.6\build\native\zlib.targets'))" />
+ <Error Condition="!Exists('..\..\..\..\..\..\nuget\libconfig_vc120.1.4.9.4\build\native\libconfig_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\libconfig_vc120.1.4.9.4\build\native\libconfig_vc120.targets'))" />
+ <Error Condition="!Exists('..\..\..\..\..\..\nuget\libsodium_vc120.0.4.5.1\build\native\libsodium_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\libsodium_vc120.0.4.5.1\build\native\libsodium_vc120.targets'))" />
+ <Error Condition="!Exists('..\..\..\..\..\..\nuget\libzmq_vc120.4.1.0.4\build\native\libzmq_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\libzmq_vc120.4.1.0.4\build\native\libzmq_vc120.targets'))" />
+ <Error Condition="!Exists('..\..\..\..\..\..\nuget\czmq_vc120.2.2.0.7\build\native\czmq_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\czmq_vc120.2.2.0.7\build\native\czmq_vc120.targets'))" />
+ <Error Condition="!Exists('..\..\..\..\..\..\nuget\czmqpp_vc120.1.0.0.3\build\native\czmqpp_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\czmqpp_vc120.1.0.0.3\build\native\czmqpp_vc120.targets'))" />
</Target>
</Project> \ No newline at end of file
diff --git a/builds/msvc/vs2013/obelisk/obelisk.vcxproj.filters b/builds/msvc/vs2013/obelisk/obelisk.vcxproj.filters
index d4bc747..eee2c29 100644
--- a/builds/msvc/vs2013/obelisk/obelisk.vcxproj.filters
+++ b/builds/msvc/vs2013/obelisk/obelisk.vcxproj.filters
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
diff --git a/builds/msvc/vs2013/obelisk/packages.config b/builds/msvc/vs2013/obelisk/packages.config
index 2567b4f..d87f52c 100644
--- a/builds/msvc/vs2013/obelisk/packages.config
+++ b/builds/msvc/vs2013/obelisk/packages.config
@@ -2,8 +2,12 @@
<packages>
<package id="boost" version="1.55.0.16" targetFramework="Native" />
<package id="Crc32C" version="1.0.4" targetFramework="Native" />
+ <package id="czmq_vc120" version="2.2.0.7" targetFramework="Native" developmentDependency="true" />
+ <package id="czmqpp_vc120" version="1.0.0.3" targetFramework="Native" developmentDependency="true" />
<package id="LevelDB" version="1.16.0.5" targetFramework="Native" />
- <package id="libconfig" version="1.4.9.2" targetFramework="Native" />
+ <package id="libconfig_vc120" version="1.4.9.4" targetFramework="Native" developmentDependency="true" />
+ <package id="libsodium_vc120" version="0.4.5.1" targetFramework="Native" developmentDependency="true" />
+ <package id="libzmq_vc120" version="4.1.0.4" targetFramework="Native" developmentDependency="true" />
<package id="openssl" version="1.0.1.24" targetFramework="Native" />
<package id="openssl.redist" version="1.0.1.24" targetFramework="Native" />
<package id="Snappy" version="1.1.1.7" targetFramework="Native" />
diff --git a/builds/msvc/vs2013/properties/Common.props b/builds/msvc/vs2013/properties/Common.props
index 10e0380..2acf2e6 100644
--- a/builds/msvc/vs2013/properties/Common.props
+++ b/builds/msvc/vs2013/properties/Common.props
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<_PropertySheetDisplayName>Common Settings</_PropertySheetDisplayName>
<CharacterSet>Unicode</CharacterSet>
<TargetName>$(ProjectName)</TargetName>
@@ -11,7 +10,7 @@
<ItemDefinitionGroup>
<ClCompile>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
- <!-- Windows and CRT definitions for unicode. Note that Linux only supports unicode so char is UCS-16. -->
+ <!-- Windows and CRT definitions for unicode. Note that Linux only supports unicode so char is 16 bit. -->
<PreprocessorDefinitions>UNICODE;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WarningLevel>Level3</WarningLevel>
</ClCompile>
diff --git a/builds/msvc/vs2013/properties/Debug.props b/builds/msvc/vs2013/properties/Debug.props
index 825321a..a286777 100644
--- a/builds/msvc/vs2013/properties/Debug.props
+++ b/builds/msvc/vs2013/properties/Debug.props
@@ -1,13 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<_PropertySheetDisplayName>Debug Configuration</_PropertySheetDisplayName>
<!-- RootNamespace is used to deconflict output files from differing project versions. -->
<IntDir>$(ProjectDir)..\..\..\..\obj\$(PlatformName)\$(Configuration)\$(RootNamespace)\</IntDir>
<OutDir>$(ProjectDir)..\..\..\..\bin\$(PlatformName)\Debug\$(RootNamespace)\</OutDir>
- <LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup>
diff --git a/builds/msvc/vs2013/properties/Dynamic.props b/builds/msvc/vs2013/properties/Dynamic.props
index 8f57f13..9e74917 100644
--- a/builds/msvc/vs2013/properties/Dynamic.props
+++ b/builds/msvc/vs2013/properties/Dynamic.props
@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="Common.props" />
</ImportGroup>
<PropertyGroup>
- <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<_PropertySheetDisplayName>Dynamic Library</_PropertySheetDisplayName>
</PropertyGroup>
diff --git a/builds/msvc/vs2013/properties/DynamicDebug.props b/builds/msvc/vs2013/properties/DynamicDebug.props
index 81befdc..ee40a01 100644
--- a/builds/msvc/vs2013/properties/DynamicDebug.props
+++ b/builds/msvc/vs2013/properties/DynamicDebug.props
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="Dynamic.props" />
@@ -7,7 +7,6 @@
</ImportGroup>
<PropertyGroup>
- <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<_PropertySheetDisplayName>Dynamic Debug Library</_PropertySheetDisplayName>
</PropertyGroup>
@@ -15,6 +14,7 @@
<ClCompile>
<!-- Linking CRT dynamically when building a dynamic library is conventional. -->
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <LinkIncremental>true</LinkIncremental>
</ClCompile>
</ItemDefinitionGroup>
diff --git a/builds/msvc/vs2013/properties/DynamicRelease.props b/builds/msvc/vs2013/properties/DynamicRelease.props
index 1b1de61..c3f36f8 100644
--- a/builds/msvc/vs2013/properties/DynamicRelease.props
+++ b/builds/msvc/vs2013/properties/DynamicRelease.props
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="Dynamic.props" />
@@ -7,7 +7,6 @@
</ImportGroup>
<PropertyGroup>
- <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<_PropertySheetDisplayName>Dynamic Release Library</_PropertySheetDisplayName>
</PropertyGroup>
diff --git a/builds/msvc/vs2013/properties/LinkTimeCodeGeneration.props b/builds/msvc/vs2013/properties/LinkTimeCodeGeneration.props
index 42708b5..644462f 100644
--- a/builds/msvc/vs2013/properties/LinkTimeCodeGeneration.props
+++ b/builds/msvc/vs2013/properties/LinkTimeCodeGeneration.props
@@ -1,17 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<_PropertySheetDisplayName>Link Time Code Generation Library</_PropertySheetDisplayName>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<WholeProgramOptimization>true</WholeProgramOptimization>
-
- <!-- This overrides Debug.props->LinkIncremental and therefore this reference must always be set after Debug.props is included. -->
- <LinkIncremental>false</LinkIncremental>
</ClCompile>
<Link>
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
diff --git a/builds/msvc/vs2013/properties/Release.props b/builds/msvc/vs2013/properties/Release.props
index aff972f..c211128 100644
--- a/builds/msvc/vs2013/properties/Release.props
+++ b/builds/msvc/vs2013/properties/Release.props
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<_PropertySheetDisplayName>Release Configuration</_PropertySheetDisplayName>
<!-- RootNamespace is used to deconflict output files from differing project versions. -->
<IntDir>$(ProjectDir)..\..\..\..\obj\$(PlatformName)\$(Configuration)\$(RootNamespace)\</IntDir>
diff --git a/builds/msvc/vs2013/properties/Static.props b/builds/msvc/vs2013/properties/Static.props
index 9b30a13..85207e4 100644
--- a/builds/msvc/vs2013/properties/Static.props
+++ b/builds/msvc/vs2013/properties/Static.props
@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="Common.props" />
</ImportGroup>
<PropertyGroup>
- <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<_PropertySheetDisplayName>Static Library</_PropertySheetDisplayName>
</PropertyGroup>
diff --git a/builds/msvc/vs2013/properties/StaticDebug.props b/builds/msvc/vs2013/properties/StaticDebug.props
index f0693f1..8668424 100644
--- a/builds/msvc/vs2013/properties/StaticDebug.props
+++ b/builds/msvc/vs2013/properties/StaticDebug.props
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="Static.props" />
@@ -7,7 +7,6 @@
</ImportGroup>
<PropertyGroup>
- <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<_PropertySheetDisplayName>Static Debug Library</_PropertySheetDisplayName>
</PropertyGroup>
@@ -15,6 +14,7 @@
<ClCompile>
<!-- Linking CRT statically when building a static library is conventional. -->
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <LinkIncremental>true</LinkIncremental>
</ClCompile>
</ItemDefinitionGroup>
diff --git a/builds/msvc/vs2013/properties/StaticDebugLinkTimeCodeGeneration.props b/builds/msvc/vs2013/properties/StaticDebugLinkTimeCodeGeneration.props
index 18b017c..a35e0e7 100644
--- a/builds/msvc/vs2013/properties/StaticDebugLinkTimeCodeGeneration.props
+++ b/builds/msvc/vs2013/properties/StaticDebugLinkTimeCodeGeneration.props
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="Debug.props" />
@@ -7,7 +7,6 @@
</ImportGroup>
<PropertyGroup>
- <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<_PropertySheetDisplayName>Static Debug Link Time Code Generation Library</_PropertySheetDisplayName>
</PropertyGroup>
@@ -15,6 +14,7 @@
<ClCompile>
<!-- Linking CRT statically when building a static library is conventional. -->
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <LinkIncremental>false</LinkIncremental>
</ClCompile>
</ItemDefinitionGroup>
diff --git a/builds/msvc/vs2013/properties/StaticLinkTimeCodeGeneration.props b/builds/msvc/vs2013/properties/StaticLinkTimeCodeGeneration.props
index 8009311..6a8d883 100644
--- a/builds/msvc/vs2013/properties/StaticLinkTimeCodeGeneration.props
+++ b/builds/msvc/vs2013/properties/StaticLinkTimeCodeGeneration.props
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="Static.props" />
@@ -7,7 +7,6 @@
</ImportGroup>
<PropertyGroup>
- <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<_PropertySheetDisplayName>Static Link Time Code Generation Library</_PropertySheetDisplayName>
<!-- This overrides Static.props->Common.props->TargetName and therefore this
diff --git a/builds/msvc/vs2013/properties/StaticRelease.props b/builds/msvc/vs2013/properties/StaticRelease.props
index d7a6058..5eaadae 100644
--- a/builds/msvc/vs2013/properties/StaticRelease.props
+++ b/builds/msvc/vs2013/properties/StaticRelease.props
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="Static.props" />
@@ -7,7 +7,6 @@
</ImportGroup>
<PropertyGroup>
- <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<_PropertySheetDisplayName>Static Release Library</_PropertySheetDisplayName>
</PropertyGroup>
diff --git a/builds/msvc/vs2013/properties/StaticReleaseLinkTimeCodeGeneration.props b/builds/msvc/vs2013/properties/StaticReleaseLinkTimeCodeGeneration.props
index 668a9e9..4515bef 100644
--- a/builds/msvc/vs2013/properties/StaticReleaseLinkTimeCodeGeneration.props
+++ b/builds/msvc/vs2013/properties/StaticReleaseLinkTimeCodeGeneration.props
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets">
<Import Project="Release.props" />
@@ -7,7 +7,6 @@
</ImportGroup>
<PropertyGroup>
- <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<_PropertySheetDisplayName>Static Release Link Time Code Generation Library</_PropertySheetDisplayName>
</PropertyGroup>
diff --git a/builds/msvc/vs2013/properties/Win32.props b/builds/msvc/vs2013/properties/Win32.props
index bc64e84..8d611a0 100644
--- a/builds/msvc/vs2013/properties/Win32.props
+++ b/builds/msvc/vs2013/properties/Win32.props
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<_PropertySheetDisplayName>Win32 Settings</_PropertySheetDisplayName>
</PropertyGroup>
diff --git a/builds/msvc/vs2013/properties/x64.props b/builds/msvc/vs2013/properties/x64.props
index 1c750d6..ddf9c14 100644
--- a/builds/msvc/vs2013/properties/x64.props
+++ b/builds/msvc/vs2013/properties/x64.props
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<_PropertySheetDisplayName>x64 Settings</_PropertySheetDisplayName>
</PropertyGroup>