From 455bba6a15a67cb6e04a6aab6ad0635388cc7a8c Mon Sep 17 00:00:00 2001
From: evoskuil <eric@voskuil.org>
Date: Thu, 5 Jun 2014 12:12:18 -0700
Subject: [PATCH 1/2] Refresh VS 2010/2012 projects with recent VS2013 updates.

---
 builds/msvc/vs2010/inproc_lat/inproc_lat.props   | 10 +++-------
 builds/msvc/vs2010/inproc_lat/inproc_lat.vcxproj |  2 +-
 builds/msvc/vs2010/inproc_thr/inproc_thr.props   | 10 +++-------
 builds/msvc/vs2010/inproc_thr/inproc_thr.vcxproj |  2 +-
 builds/msvc/vs2010/libzmq/libzmq.props           | 11 ++---------
 builds/msvc/vs2010/libzmq/libzmq.vcxproj         |  4 ++--
 builds/msvc/vs2010/libzmq/libzmq.vcxproj.filters |  2 +-
 builds/msvc/vs2010/local_lat/local_lat.props     | 10 +++-------
 builds/msvc/vs2010/local_lat/local_lat.vcxproj   |  2 +-
 builds/msvc/vs2010/local_thr/local_thr.props     | 10 +++-------
 builds/msvc/vs2010/local_thr/local_thr.vcxproj   |  2 +-
 builds/msvc/vs2010/remote_lat/remote_lat.props   | 10 +++-------
 builds/msvc/vs2010/remote_lat/remote_lat.vcxproj |  2 +-
 builds/msvc/vs2010/remote_thr/remote_thr.props   | 10 +++-------
 builds/msvc/vs2010/remote_thr/remote_thr.vcxproj |  2 +-
 builds/msvc/vs2012/inproc_lat/inproc_lat.props   | 10 +++-------
 builds/msvc/vs2012/inproc_lat/inproc_lat.vcxproj |  2 +-
 builds/msvc/vs2012/inproc_thr/inproc_thr.props   | 10 +++-------
 builds/msvc/vs2012/inproc_thr/inproc_thr.vcxproj |  2 +-
 builds/msvc/vs2012/libzmq/libzmq.props           | 11 ++---------
 builds/msvc/vs2012/libzmq/libzmq.vcxproj         |  4 ++--
 builds/msvc/vs2012/libzmq/libzmq.vcxproj.filters |  2 +-
 builds/msvc/vs2012/local_lat/local_lat.props     | 10 +++-------
 builds/msvc/vs2012/local_lat/local_lat.vcxproj   |  2 +-
 builds/msvc/vs2012/local_thr/local_thr.props     | 10 +++-------
 builds/msvc/vs2012/local_thr/local_thr.vcxproj   |  2 +-
 builds/msvc/vs2012/remote_lat/remote_lat.props   | 10 +++-------
 builds/msvc/vs2012/remote_lat/remote_lat.vcxproj |  2 +-
 builds/msvc/vs2012/remote_thr/remote_thr.props   | 10 +++-------
 builds/msvc/vs2012/remote_thr/remote_thr.vcxproj |  2 +-
 30 files changed, 58 insertions(+), 120 deletions(-)

diff --git a/builds/msvc/vs2010/inproc_lat/inproc_lat.props b/builds/msvc/vs2010/inproc_lat/inproc_lat.props
index 5272d1fe..b3c584b4 100644
--- a/builds/msvc/vs2010/inproc_lat/inproc_lat.props
+++ b/builds/msvc/vs2010/inproc_lat/inproc_lat.props
@@ -10,9 +10,9 @@
   <!-- Configuration -->
 
   <ItemDefinitionGroup>
-    <PreBuildEvent>
-      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)src\</Command>
-    </PreBuildEvent>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
     <Link>
       <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>    
@@ -40,10 +40,6 @@
 
   <!-- Messages -->
 
-  <Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)src\platform.hpp" Importance="high"/>
-  </Target>
-
   <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
     <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
     <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
diff --git a/builds/msvc/vs2010/inproc_lat/inproc_lat.vcxproj b/builds/msvc/vs2010/inproc_lat/inproc_lat.vcxproj
index e0021d0f..acff5615 100644
--- a/builds/msvc/vs2010/inproc_lat/inproc_lat.vcxproj
+++ b/builds/msvc/vs2010/inproc_lat/inproc_lat.vcxproj
@@ -64,7 +64,7 @@
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\src\platform.hpp" />
+    <ClInclude Include="..\..\platform.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\..\perf\inproc_lat.cpp" />
diff --git a/builds/msvc/vs2010/inproc_thr/inproc_thr.props b/builds/msvc/vs2010/inproc_thr/inproc_thr.props
index fe6eff71..f199caf8 100644
--- a/builds/msvc/vs2010/inproc_thr/inproc_thr.props
+++ b/builds/msvc/vs2010/inproc_thr/inproc_thr.props
@@ -10,9 +10,9 @@
   <!-- Configuration -->
 
   <ItemDefinitionGroup>
-    <PreBuildEvent>
-      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)src\</Command>
-    </PreBuildEvent>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
     <Link>
       <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>    
@@ -40,10 +40,6 @@
 
   <!-- Messages -->
 
-  <Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)src\platform.hpp" Importance="high"/>
-  </Target>
-
   <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
     <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
     <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
diff --git a/builds/msvc/vs2010/inproc_thr/inproc_thr.vcxproj b/builds/msvc/vs2010/inproc_thr/inproc_thr.vcxproj
index 4c220b3c..e1d041c7 100644
--- a/builds/msvc/vs2010/inproc_thr/inproc_thr.vcxproj
+++ b/builds/msvc/vs2010/inproc_thr/inproc_thr.vcxproj
@@ -64,7 +64,7 @@
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\src\platform.hpp" />
+    <ClInclude Include="..\..\platform.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\..\perf\inproc_thr.cpp" />
diff --git a/builds/msvc/vs2010/libzmq/libzmq.props b/builds/msvc/vs2010/libzmq/libzmq.props
index 3a380504..0337ba38 100644
--- a/builds/msvc/vs2010/libzmq/libzmq.props
+++ b/builds/msvc/vs2010/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/vs2010/libzmq/libzmq.vcxproj b/builds/msvc/vs2010/libzmq/libzmq.vcxproj
index e66aa285..e4e65f4c 100644
--- a/builds/msvc/vs2010/libzmq/libzmq.vcxproj
+++ b/builds/msvc/vs2010/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/vs2010/libzmq/libzmq.vcxproj.filters b/builds/msvc/vs2010/libzmq/libzmq.vcxproj.filters
index 27eb4b1b..e088f000 100644
--- a/builds/msvc/vs2010/libzmq/libzmq.vcxproj.filters
+++ b/builds/msvc/vs2010/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">
diff --git a/builds/msvc/vs2010/local_lat/local_lat.props b/builds/msvc/vs2010/local_lat/local_lat.props
index bc65ea29..18e5707e 100644
--- a/builds/msvc/vs2010/local_lat/local_lat.props
+++ b/builds/msvc/vs2010/local_lat/local_lat.props
@@ -10,9 +10,9 @@
   <!-- Configuration -->
 
   <ItemDefinitionGroup>
-    <PreBuildEvent>
-      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)src\</Command>
-    </PreBuildEvent>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
     <Link>
       <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>    
@@ -40,10 +40,6 @@
 
   <!-- Messages -->
 
-  <Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)src\platform.hpp" Importance="high"/>
-  </Target>
-
   <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
     <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
     <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
diff --git a/builds/msvc/vs2010/local_lat/local_lat.vcxproj b/builds/msvc/vs2010/local_lat/local_lat.vcxproj
index 4d7bbe26..2b7880d3 100644
--- a/builds/msvc/vs2010/local_lat/local_lat.vcxproj
+++ b/builds/msvc/vs2010/local_lat/local_lat.vcxproj
@@ -64,7 +64,7 @@
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup> 
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\src\platform.hpp" />
+    <ClInclude Include="..\..\platform.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\..\perf\local_lat.cpp" />
diff --git a/builds/msvc/vs2010/local_thr/local_thr.props b/builds/msvc/vs2010/local_thr/local_thr.props
index 1d184517..d92ca3cb 100644
--- a/builds/msvc/vs2010/local_thr/local_thr.props
+++ b/builds/msvc/vs2010/local_thr/local_thr.props
@@ -10,9 +10,9 @@
   <!-- Configuration -->
 
   <ItemDefinitionGroup>
-    <PreBuildEvent>
-      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)src\</Command>
-    </PreBuildEvent>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
     <Link>
       <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>    
@@ -40,10 +40,6 @@
 
   <!-- Messages -->
 
-  <Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)src\platform.hpp" Importance="high"/>
-  </Target>
-
   <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
     <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
     <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
diff --git a/builds/msvc/vs2010/local_thr/local_thr.vcxproj b/builds/msvc/vs2010/local_thr/local_thr.vcxproj
index fc2c8b9e..f4645f30 100644
--- a/builds/msvc/vs2010/local_thr/local_thr.vcxproj
+++ b/builds/msvc/vs2010/local_thr/local_thr.vcxproj
@@ -68,7 +68,7 @@
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\src\platform.hpp" />
+    <ClInclude Include="..\..\platform.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\..\perf\local_thr.cpp" />
diff --git a/builds/msvc/vs2010/remote_lat/remote_lat.props b/builds/msvc/vs2010/remote_lat/remote_lat.props
index fbbd5aab..8df2ec54 100644
--- a/builds/msvc/vs2010/remote_lat/remote_lat.props
+++ b/builds/msvc/vs2010/remote_lat/remote_lat.props
@@ -10,9 +10,9 @@
   <!-- Configuration -->
 
   <ItemDefinitionGroup>
-    <PreBuildEvent>
-      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)src\</Command>
-    </PreBuildEvent>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
     <Link>
       <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>    
@@ -40,10 +40,6 @@
 
   <!-- Messages -->
 
-  <Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)src\platform.hpp" Importance="high"/>
-  </Target>
-
   <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
     <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
     <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
diff --git a/builds/msvc/vs2010/remote_lat/remote_lat.vcxproj b/builds/msvc/vs2010/remote_lat/remote_lat.vcxproj
index e335d8d1..3d436895 100644
--- a/builds/msvc/vs2010/remote_lat/remote_lat.vcxproj
+++ b/builds/msvc/vs2010/remote_lat/remote_lat.vcxproj
@@ -68,7 +68,7 @@
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup> 
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\src\platform.hpp" />
+    <ClInclude Include="..\..\platform.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\..\perf\remote_lat.cpp" />
diff --git a/builds/msvc/vs2010/remote_thr/remote_thr.props b/builds/msvc/vs2010/remote_thr/remote_thr.props
index 5c4a3820..19a3bb81 100644
--- a/builds/msvc/vs2010/remote_thr/remote_thr.props
+++ b/builds/msvc/vs2010/remote_thr/remote_thr.props
@@ -10,9 +10,9 @@
   <!-- Configuration -->
 
   <ItemDefinitionGroup>
-    <PreBuildEvent>
-      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)src\</Command>
-    </PreBuildEvent>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
     <Link>
       <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>    
@@ -40,10 +40,6 @@
 
   <!-- Messages -->
 
-  <Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)src\platform.hpp" Importance="high"/>
-  </Target>
-
   <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
     <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
     <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
diff --git a/builds/msvc/vs2010/remote_thr/remote_thr.vcxproj b/builds/msvc/vs2010/remote_thr/remote_thr.vcxproj
index e52a43d8..a156b14e 100644
--- a/builds/msvc/vs2010/remote_thr/remote_thr.vcxproj
+++ b/builds/msvc/vs2010/remote_thr/remote_thr.vcxproj
@@ -64,7 +64,7 @@
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>  
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\src\platform.hpp" />
+    <ClInclude Include="..\..\platform.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\..\perf\remote_thr.cpp" />
diff --git a/builds/msvc/vs2012/inproc_lat/inproc_lat.props b/builds/msvc/vs2012/inproc_lat/inproc_lat.props
index 5272d1fe..b3c584b4 100644
--- a/builds/msvc/vs2012/inproc_lat/inproc_lat.props
+++ b/builds/msvc/vs2012/inproc_lat/inproc_lat.props
@@ -10,9 +10,9 @@
   <!-- Configuration -->
 
   <ItemDefinitionGroup>
-    <PreBuildEvent>
-      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)src\</Command>
-    </PreBuildEvent>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
     <Link>
       <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>    
@@ -40,10 +40,6 @@
 
   <!-- Messages -->
 
-  <Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)src\platform.hpp" Importance="high"/>
-  </Target>
-
   <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
     <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
     <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
diff --git a/builds/msvc/vs2012/inproc_lat/inproc_lat.vcxproj b/builds/msvc/vs2012/inproc_lat/inproc_lat.vcxproj
index 87a160fe..ff73ccec 100644
--- a/builds/msvc/vs2012/inproc_lat/inproc_lat.vcxproj
+++ b/builds/msvc/vs2012/inproc_lat/inproc_lat.vcxproj
@@ -64,7 +64,7 @@
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\src\platform.hpp" />
+    <ClInclude Include="..\..\platform.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\..\perf\inproc_lat.cpp" />
diff --git a/builds/msvc/vs2012/inproc_thr/inproc_thr.props b/builds/msvc/vs2012/inproc_thr/inproc_thr.props
index fe6eff71..f199caf8 100644
--- a/builds/msvc/vs2012/inproc_thr/inproc_thr.props
+++ b/builds/msvc/vs2012/inproc_thr/inproc_thr.props
@@ -10,9 +10,9 @@
   <!-- Configuration -->
 
   <ItemDefinitionGroup>
-    <PreBuildEvent>
-      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)src\</Command>
-    </PreBuildEvent>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
     <Link>
       <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>    
@@ -40,10 +40,6 @@
 
   <!-- Messages -->
 
-  <Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)src\platform.hpp" Importance="high"/>
-  </Target>
-
   <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
     <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
     <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
diff --git a/builds/msvc/vs2012/inproc_thr/inproc_thr.vcxproj b/builds/msvc/vs2012/inproc_thr/inproc_thr.vcxproj
index 1ef629db..e8bba125 100644
--- a/builds/msvc/vs2012/inproc_thr/inproc_thr.vcxproj
+++ b/builds/msvc/vs2012/inproc_thr/inproc_thr.vcxproj
@@ -64,7 +64,7 @@
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\src\platform.hpp" />
+    <ClInclude Include="..\..\platform.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\..\perf\inproc_thr.cpp" />
diff --git a/builds/msvc/vs2012/libzmq/libzmq.props b/builds/msvc/vs2012/libzmq/libzmq.props
index 3a380504..0337ba38 100644
--- a/builds/msvc/vs2012/libzmq/libzmq.props
+++ b/builds/msvc/vs2012/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/vs2012/libzmq/libzmq.vcxproj b/builds/msvc/vs2012/libzmq/libzmq.vcxproj
index 276db2a0..835b6dd6 100644
--- a/builds/msvc/vs2012/libzmq/libzmq.vcxproj
+++ b/builds/msvc/vs2012/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/vs2012/libzmq/libzmq.vcxproj.filters b/builds/msvc/vs2012/libzmq/libzmq.vcxproj.filters
index 27eb4b1b..e088f000 100644
--- a/builds/msvc/vs2012/libzmq/libzmq.vcxproj.filters
+++ b/builds/msvc/vs2012/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">
diff --git a/builds/msvc/vs2012/local_lat/local_lat.props b/builds/msvc/vs2012/local_lat/local_lat.props
index bc65ea29..18e5707e 100644
--- a/builds/msvc/vs2012/local_lat/local_lat.props
+++ b/builds/msvc/vs2012/local_lat/local_lat.props
@@ -10,9 +10,9 @@
   <!-- Configuration -->
 
   <ItemDefinitionGroup>
-    <PreBuildEvent>
-      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)src\</Command>
-    </PreBuildEvent>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
     <Link>
       <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>    
@@ -40,10 +40,6 @@
 
   <!-- Messages -->
 
-  <Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)src\platform.hpp" Importance="high"/>
-  </Target>
-
   <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
     <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
     <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
diff --git a/builds/msvc/vs2012/local_lat/local_lat.vcxproj b/builds/msvc/vs2012/local_lat/local_lat.vcxproj
index 401db37b..075d59e1 100644
--- a/builds/msvc/vs2012/local_lat/local_lat.vcxproj
+++ b/builds/msvc/vs2012/local_lat/local_lat.vcxproj
@@ -64,7 +64,7 @@
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup> 
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\src\platform.hpp" />
+    <ClInclude Include="..\..\platform.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\..\perf\local_lat.cpp" />
diff --git a/builds/msvc/vs2012/local_thr/local_thr.props b/builds/msvc/vs2012/local_thr/local_thr.props
index 1d184517..d92ca3cb 100644
--- a/builds/msvc/vs2012/local_thr/local_thr.props
+++ b/builds/msvc/vs2012/local_thr/local_thr.props
@@ -10,9 +10,9 @@
   <!-- Configuration -->
 
   <ItemDefinitionGroup>
-    <PreBuildEvent>
-      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)src\</Command>
-    </PreBuildEvent>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
     <Link>
       <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>    
@@ -40,10 +40,6 @@
 
   <!-- Messages -->
 
-  <Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)src\platform.hpp" Importance="high"/>
-  </Target>
-
   <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
     <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
     <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
diff --git a/builds/msvc/vs2012/local_thr/local_thr.vcxproj b/builds/msvc/vs2012/local_thr/local_thr.vcxproj
index 817bcef6..b77495b0 100644
--- a/builds/msvc/vs2012/local_thr/local_thr.vcxproj
+++ b/builds/msvc/vs2012/local_thr/local_thr.vcxproj
@@ -68,7 +68,7 @@
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\src\platform.hpp" />
+    <ClInclude Include="..\..\platform.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\..\perf\local_thr.cpp" />
diff --git a/builds/msvc/vs2012/remote_lat/remote_lat.props b/builds/msvc/vs2012/remote_lat/remote_lat.props
index fbbd5aab..8df2ec54 100644
--- a/builds/msvc/vs2012/remote_lat/remote_lat.props
+++ b/builds/msvc/vs2012/remote_lat/remote_lat.props
@@ -10,9 +10,9 @@
   <!-- Configuration -->
 
   <ItemDefinitionGroup>
-    <PreBuildEvent>
-      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)src\</Command>
-    </PreBuildEvent>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
     <Link>
       <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>    
@@ -40,10 +40,6 @@
 
   <!-- Messages -->
 
-  <Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)src\platform.hpp" Importance="high"/>
-  </Target>
-
   <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
     <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
     <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
diff --git a/builds/msvc/vs2012/remote_lat/remote_lat.vcxproj b/builds/msvc/vs2012/remote_lat/remote_lat.vcxproj
index 5eb16655..46e798e0 100644
--- a/builds/msvc/vs2012/remote_lat/remote_lat.vcxproj
+++ b/builds/msvc/vs2012/remote_lat/remote_lat.vcxproj
@@ -68,7 +68,7 @@
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup> 
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\src\platform.hpp" />
+    <ClInclude Include="..\..\platform.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\..\perf\remote_lat.cpp" />
diff --git a/builds/msvc/vs2012/remote_thr/remote_thr.props b/builds/msvc/vs2012/remote_thr/remote_thr.props
index 5c4a3820..19a3bb81 100644
--- a/builds/msvc/vs2012/remote_thr/remote_thr.props
+++ b/builds/msvc/vs2012/remote_thr/remote_thr.props
@@ -10,9 +10,9 @@
   <!-- Configuration -->
 
   <ItemDefinitionGroup>
-    <PreBuildEvent>
-      <Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)src\</Command>
-    </PreBuildEvent>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
     <Link>
       <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>    
@@ -40,10 +40,6 @@
 
   <!-- Messages -->
 
-  <Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)src\platform.hpp" Importance="high"/>
-  </Target>
-
   <Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
     <Message Text="Linkage-libzmq    : $(Linkage-libzmq)" Importance="high"/>
     <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
diff --git a/builds/msvc/vs2012/remote_thr/remote_thr.vcxproj b/builds/msvc/vs2012/remote_thr/remote_thr.vcxproj
index 01ac293f..0d0dac73 100644
--- a/builds/msvc/vs2012/remote_thr/remote_thr.vcxproj
+++ b/builds/msvc/vs2012/remote_thr/remote_thr.vcxproj
@@ -64,7 +64,7 @@
     <Import Project="$(ProjectDir)$(ProjectName).props" />
   </ImportGroup>  
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\src\platform.hpp" />
+    <ClInclude Include="..\..\platform.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\..\perf\remote_thr.cpp" />

From 10e5277e9f2374dc03f29d3ef9911bbf4570b396 Mon Sep 17 00:00:00 2001
From: evoskuil <eric@voskuil.org>
Date: Thu, 5 Jun 2014 12:13:00 -0700
Subject: [PATCH 2/2] Update NuGet template to incorporate platform.hpp from
 relative dir.

---
 packaging/nuget/package.gsl    | 1 +
 packaging/nuget/package.nuspec | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packaging/nuget/package.gsl b/packaging/nuget/package.gsl
index 331b251b..4d306e5e 100644
--- a/packaging/nuget/package.gsl
+++ b/packaging/nuget/package.gsl
@@ -39,6 +39,7 @@
         <!-- include -->
         
         <file src="..\\..\\include\\*.h" target="build\\native\\include" />
+        <file src="..\\..\\builds\\msvc\\platform.hpp" target="build\\native\\include" />
 
         <!-- targets -->
       
diff --git a/packaging/nuget/package.nuspec b/packaging/nuget/package.nuspec
index 04d78ac8..89fce10a 100644
--- a/packaging/nuget/package.nuspec
+++ b/packaging/nuget/package.nuspec
@@ -23,12 +23,13 @@
         <tags>native, libzmq, zmq, 0MQ, messaging, sockets, C++</tags>
         <dependencies>
             <dependency id="libsodium_vc120" version="0.5.0.0" />
-        </dependencies>        
+        </dependencies>
     </metadata>
     <files>
         <!-- include -->
         
         <file src="..\..\include\*.h" target="build\native\include" />
+        <file src="..\..\builds\msvc\*.hpp" target="build\native\include" />
 
         <!-- targets -->