Merge pull request #644 from ipechorin/master

Fix MSVC 2008 and 2010 project files

builds/msvc/libzmq/libzmq.vcproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="windows-1250"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="libzmq"
 	ProjectGUID="{641C5F36-32EE-4323-B740-992B651CF9D6}"
 	RootNamespace="libzmq"
@@ -396,10 +396,6 @@
 				RelativePath="..\..\..\src\dealer.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\src\decoder.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\src\devpoll.cpp"
 				>
@@ -408,10 +404,6 @@
 				RelativePath="..\..\..\src\dist.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\src\encoder.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\src\epoll.cpp"
 				>
@@ -464,6 +456,10 @@
 				RelativePath="..\..\..\src\mailbox.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\src\mechanism.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\src\msg.cpp"
 				>
@@ -472,6 +468,10 @@
 				RelativePath="..\..\..\src\mtrie.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\src\null_mechanism.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\src\object.cpp"
 				>
@@ -504,6 +504,10 @@
 				RelativePath="..\..\..\src\pipe.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\src\plain_mechanism.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\src\poll.cpp"
 				>
@@ -572,6 +576,10 @@
 				RelativePath="..\..\..\src\socket_base.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\src\stream.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\src\stream_engine.cpp"
 				>
@@ -612,6 +620,14 @@
 				RelativePath="..\..\..\src\v1_encoder.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\src\v2_decoder.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\v2_encoder.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\src\xpub.cpp"
 				>
@@ -750,6 +766,10 @@
 				RelativePath="..\..\..\src\mailbox.hpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\src\mechanism.hpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\src\msg.hpp"
 				>
@@ -762,6 +782,10 @@
 				RelativePath="..\..\..\src\mutex.hpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\src\null_mechanism.hpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\src\object.hpp"
 				>
@@ -794,6 +818,10 @@
 				RelativePath="..\..\..\src\pipe.hpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\src\plain_mechanism.hpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\src\platform.hpp"
 				>
@@ -870,6 +898,10 @@
 				RelativePath="..\..\..\src\stdint.hpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\src\stream.hpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\src\stream_engine.hpp"
 				>
@@ -914,6 +946,18 @@
 				RelativePath="..\..\..\src\v1_protocol.hpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\src\v2_decoder.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\v2_encoder.hpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\v2_protocol.hpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\src\windows.hpp"
 				>

builds/msvc/libzmq/libzmq.vcxproj

@@ -185,8 +185,10 @@
     <ClCompile Include="..\..\..\src\kqueue.cpp" />
     <ClCompile Include="..\..\..\src\lb.cpp" />
     <ClCompile Include="..\..\..\src\mailbox.cpp" />
+    <ClCompile Include="..\..\..\src\mechanism.cpp" />
     <ClCompile Include="..\..\..\src\msg.cpp" />
     <ClCompile Include="..\..\..\src\mtrie.cpp" />
+    <ClCompile Include="..\..\..\src\null_mechanism.cpp" />
     <ClCompile Include="..\..\..\src\object.cpp" />
     <ClCompile Include="..\..\..\src\options.cpp" />
     <ClCompile Include="..\..\..\src\own.cpp" />
@@ -195,6 +197,7 @@
     <ClCompile Include="..\..\..\src\pgm_sender.cpp" />
     <ClCompile Include="..\..\..\src\pgm_socket.cpp" />
     <ClCompile Include="..\..\..\src\pipe.cpp" />
+    <ClCompile Include="..\..\..\src\plain_mechanism.cpp" />
     <ClCompile Include="..\..\..\src\poll.cpp" />
     <ClCompile Include="..\..\..\src\poller_base.cpp" />
     <ClCompile Include="..\..\..\src\precompiled.cpp">
@@ -215,6 +218,7 @@
     <ClCompile Include="..\..\..\src\session_base.cpp" />
     <ClCompile Include="..\..\..\src\signaler.cpp" />
     <ClCompile Include="..\..\..\src\socket_base.cpp" />
+    <ClCompile Include="..\..\..\src\stream.cpp" />
     <ClCompile Include="..\..\..\src\stream_engine.cpp" />
     <ClCompile Include="..\..\..\src\sub.cpp" />
     <ClCompile Include="..\..\..\src\tcp.cpp" />
@@ -263,9 +267,11 @@
     <ClInclude Include="..\..\..\src\lb.hpp" />
     <ClInclude Include="..\..\..\src\likely.hpp" />
     <ClInclude Include="..\..\..\src\mailbox.hpp" />
+    <ClInclude Include="..\..\..\src\mechanism.hpp" />
     <ClInclude Include="..\..\..\src\msg.hpp" />
     <ClInclude Include="..\..\..\src\mtrie.hpp" />
     <ClInclude Include="..\..\..\src\mutex.hpp" />
+    <ClInclude Include="..\..\..\src\null_mechanism.hpp" />
     <ClInclude Include="..\..\..\src\object.hpp" />
     <ClInclude Include="..\..\..\src\options.hpp" />
     <ClInclude Include="..\..\..\src\own.hpp" />
@@ -274,6 +280,7 @@
     <ClInclude Include="..\..\..\src\pgm_sender.hpp" />
     <ClInclude Include="..\..\..\src\pgm_socket.hpp" />
     <ClInclude Include="..\..\..\src\pipe.hpp" />
+    <ClInclude Include="..\..\..\src\plain_mechanism.hpp" />
     <ClInclude Include="..\..\..\src\platform.hpp" />
     <ClInclude Include="..\..\..\src\poll.hpp" />
     <ClInclude Include="..\..\..\src\poller.hpp" />
@@ -294,6 +301,7 @@
     <ClInclude Include="..\..\..\src\signaler.hpp" />
     <ClInclude Include="..\..\..\src\socket_base.hpp" />
     <ClInclude Include="..\..\..\src\stdint.hpp" />
+    <ClInclude Include="..\..\..\src\stream.hpp" />
     <ClInclude Include="..\..\..\src\stream_engine.hpp" />
     <ClInclude Include="..\..\..\src\sub.hpp" />
     <ClInclude Include="..\..\..\src\tcp.hpp" />
@@ -317,4 +325,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

builds/msvc/libzmq/libzmq.vcxproj.filters

@@ -197,6 +197,18 @@
     <ClCompile Include="..\..\..\src\v2_encoder.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\src\stream.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\mechanism.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\null_mechanism.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\plain_mechanism.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\include\zmq.h">
@@ -439,5 +451,17 @@
     <ClInclude Include="..\..\..\src\raw_encoder.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\src\stream.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\null_mechanism.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\plain_mechanism.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\mechanism.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>