From 649f4b0f2408a8d12e833712e4de7269b508b03f Mon Sep 17 00:00:00 2001
From: Dave Meehan <dave_meehan@replicated.co.uk>
Date: Thu, 5 Jun 2014 12:51:41 +0100
Subject: [PATCH] Modified libzmq project to not copy platform.hpp

---
 builds/msvc/vs2013/libzmq/libzmq.props           | 11 ++---------
 builds/msvc/vs2013/libzmq/libzmq.vcxproj         |  4 ++--
 builds/msvc/vs2013/libzmq/libzmq.vcxproj.filters |  2 +-
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/builds/msvc/vs2013/libzmq/libzmq.props b/builds/msvc/vs2013/libzmq/libzmq.props
index 3a380504..0337ba38 100644
--- a/builds/msvc/vs2013/libzmq/libzmq.props
+++ b/builds/msvc/vs2013/libzmq/libzmq.props
@@ -20,11 +20,8 @@
   <!-- Configuration -->
   
   <ItemDefinitionGroup>
-    <PreBuildEvent>
-      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)src\</Command>
-    </PreBuildEvent>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;$(ProjectDir)..\..\..\..\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <EnablePREfast>false</EnablePREfast>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;FD_SETSIZE=1024;ZMQ_USE_SELECT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -59,10 +56,6 @@
 
   <!-- Messages -->
 
-  <Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)src\platform.hpp" Importance="high"/>
-  </Target>
-  
   <Target Name="OptionInfo" BeforeTargets="PrepareForBuild">
     <Message Text="Option-openpgm    : $(Option-openpgm)" Importance="high"/>
     <Message Text="Option-sodium     : $(Option-sodium)" Importance="high"/>
@@ -73,4 +66,4 @@
     <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
   </Target>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2013/libzmq/libzmq.vcxproj b/builds/msvc/vs2013/libzmq/libzmq.vcxproj
index 40f41841..cc7eb7c9 100644
--- a/builds/msvc/vs2013/libzmq/libzmq.vcxproj
+++ b/builds/msvc/vs2013/libzmq/libzmq.vcxproj
@@ -113,7 +113,7 @@
     <ClInclude Include="..\..\..\..\src\pgm_sender.hpp" />
     <ClInclude Include="..\..\..\..\src\pgm_socket.hpp" />
     <ClInclude Include="..\..\..\..\src\pipe.hpp" />
-    <ClInclude Include="..\..\..\..\src\platform.hpp" />
+    <ClInclude Include="..\..\platform.hpp" />
     <ClInclude Include="..\..\..\..\src\poll.hpp" />
     <ClInclude Include="..\..\..\..\src\poller.hpp" />
     <ClInclude Include="..\..\..\..\src\poller_base.hpp" />
@@ -243,4 +243,4 @@
     <ResourceCompile Include="..\..\resource.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2013/libzmq/libzmq.vcxproj.filters b/builds/msvc/vs2013/libzmq/libzmq.vcxproj.filters
index 27eb4b1b..e088f000 100644
--- a/builds/msvc/vs2013/libzmq/libzmq.vcxproj.filters
+++ b/builds/msvc/vs2013/libzmq/libzmq.vcxproj.filters
@@ -450,7 +450,7 @@
     <ClInclude Include="..\..\..\..\src\poll.hpp">
       <Filter>src\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\src\platform.hpp">
+    <ClInclude Include="..\..\platform.hpp">
       <Filter>src\include</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\..\src\pipe.hpp">