Commit d2b5f1f4 authored by Pieter Hintjens's avatar Pieter Hintjens

Merge pull request #543 from steve-o/vc110_fix

MSVC local_thr & remote_thr dependency fix
parents a3713cb7 a432ea14
......@@ -24,6 +24,7 @@
>
<Tool
Name="VCPreBuildEventTool"
CommandLine="copy ..\platform.hpp ..\..\..\perf"
/>
<Tool
Name="VCCustomBuildTool"
......@@ -94,6 +95,7 @@
>
<Tool
Name="VCPreBuildEventTool"
CommandLine="copy ..\platform.hpp ..\..\..\perf"
/>
<Tool
Name="VCCustomBuildTool"
......
......@@ -72,6 +72,26 @@
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
<Command>copy ..\platform.hpp ..\..\..\perf</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PreBuildEvent>
<Command>copy ..\platform.hpp ..\..\..\perf</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
<Command>copy ..\platform.hpp ..\..\..\perf</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PreBuildEvent>
<Command>copy ..\platform.hpp ..\..\..\perf</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\perf\local_thr.cpp" />
</ItemGroup>
......
......@@ -76,6 +76,26 @@
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
<Command>copy ..\platform.hpp ..\..\..\perf</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PreBuildEvent>
<Command>copy ..\platform.hpp ..\..\..\perf</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
<Command>copy ..\platform.hpp ..\..\..\perf</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PreBuildEvent>
<Command>copy ..\platform.hpp ..\..\..\perf</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\perf\local_thr.cpp" />
</ItemGroup>
......@@ -88,4 +108,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
\ No newline at end of file
</Project>
......@@ -24,6 +24,7 @@
>
<Tool
Name="VCPreBuildEventTool"
CommandLine="copy ..\platform.hpp ..\..\..\perf"
/>
<Tool
Name="VCCustomBuildTool"
......@@ -94,6 +95,7 @@
>
<Tool
Name="VCPreBuildEventTool"
CommandLine="copy ..\platform.hpp ..\..\..\perf"
/>
<Tool
Name="VCCustomBuildTool"
......
......@@ -72,6 +72,26 @@
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
<Command>copy ..\platform.hpp ..\..\..\perf</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PreBuildEvent>
<Command>copy ..\platform.hpp ..\..\..\perf</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
<Command>copy ..\platform.hpp ..\..\..\perf</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PreBuildEvent>
<Command>copy ..\platform.hpp ..\..\..\perf</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\perf\remote_thr.cpp" />
</ItemGroup>
......
......@@ -76,6 +76,26 @@
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PreBuildEvent>
<Command>copy ..\platform.hpp ..\..\..\perf</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PreBuildEvent>
<Command>copy ..\platform.hpp ..\..\..\perf</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PreBuildEvent>
<Command>copy ..\platform.hpp ..\..\..\perf</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PreBuildEvent>
<Command>copy ..\platform.hpp ..\..\..\perf</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\perf\remote_thr.cpp" />
</ItemGroup>
......@@ -88,4 +108,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
\ No newline at end of file
</Project>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment