Merge branch 'master' of https://code.ill.fr/cameo/cameo-api-cpp

msvc/cameo-api-cpp/cameo-api-cpp.vcxproj

@@ -99,45 +99,6 @@
     <ClInclude Include="..\..\src\cameo\UnmanagedApplicationException.h" />
     <ClInclude Include="..\..\src\proto\Messages.pb.h" />
   </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\cameo\Application.cpp" />
-    <ClCompile Include="..\..\src\cameo\ConnectionChecker.cpp" />
-    <ClCompile Include="..\..\src\cameo\ConnectionTimeout.cpp" />
-    <ClCompile Include="..\..\src\cameo\Event.cpp" />
-    <ClCompile Include="..\..\src\cameo\EventStreamSocket.cpp" />
-    <ClCompile Include="..\..\src\cameo\impl\ApplicationImpl.cpp" />
-    <ClCompile Include="..\..\src\cameo\impl\CancelIdGenerator.cpp" />
-    <ClCompile Include="..\..\src\cameo\impl\GenericWaitingImpl.cpp" />
-    <ClCompile Include="..\..\src\cameo\impl\HandlerImpl.cpp" />
-    <ClCompile Include="..\..\src\cameo\impl\PublisherImpl.cpp" />
-    <ClCompile Include="..\..\src\cameo\impl\RequesterImpl.cpp" />
-    <ClCompile Include="..\..\src\cameo\impl\RequestImpl.cpp" />
-    <ClCompile Include="..\..\src\cameo\impl\ResponderImpl.cpp" />
-    <ClCompile Include="..\..\src\cameo\impl\ServicesImpl.cpp" />
-    <ClCompile Include="..\..\src\cameo\impl\SocketImpl.cpp" />
-    <ClCompile Include="..\..\src\cameo\impl\SocketWaitingImpl.cpp" />
-    <ClCompile Include="..\..\src\cameo\impl\SubscriberImpl.cpp" />
-    <ClCompile Include="..\..\src\cameo\impl\WaitingImplSet.cpp" />
-    <ClCompile Include="..\..\src\cameo\InvalidArgumentException.cpp" />
-    <ClCompile Include="..\..\src\cameo\PortEvent.cpp" />
-    <ClCompile Include="..\..\src\cameo\PublisherCreationException.cpp" />
-    <ClCompile Include="..\..\src\cameo\PublisherEvent.cpp" />
-    <ClCompile Include="..\..\src\cameo\RemoteException.cpp" />
-    <ClCompile Include="..\..\src\cameo\RequesterCreationException.cpp" />
-    <ClCompile Include="..\..\src\cameo\ResponderCreationException.cpp" />
-    <ClCompile Include="..\..\src\cameo\Response.cpp" />
-    <ClCompile Include="..\..\src\cameo\ResultEvent.cpp" />
-    <ClCompile Include="..\..\src\cameo\Serializer.cpp" />
-    <ClCompile Include="..\..\src\cameo\Server.cpp" />
-    <ClCompile Include="..\..\src\cameo\Services.cpp" />
-    <ClCompile Include="..\..\src\cameo\SocketException.cpp" />
-    <ClCompile Include="..\..\src\cameo\StarterServerException.cpp" />
-    <ClCompile Include="..\..\src\cameo\StatusEvent.cpp" />
-    <ClCompile Include="..\..\src\cameo\SubscriberCreationException.cpp" />
-    <ClCompile Include="..\..\src\cameo\TimeCondition.cpp" />
-    <ClCompile Include="..\..\src\cameo\UnmanagedApplicationException.cpp" />
-    <ClCompile Include="..\..\src\proto\Messages.pb.cc" />
-  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{4C9E3D2B-5244-4971-BC21-41E865CB0732}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
@@ -196,7 +157,7 @@
     <IncludePath>C:\Users\legoc\Documents\protobuf-2.6.1\src;C:\Program Files\ZeroMQ 3.2.4\include;C:\local\boost_1_59_0;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <IncludePath>C:\Users\legoc\Documents\protobuf-2.6.1\src;C:\Program Files\ZeroMQ 3.2.4\include;C:\local\boost_1_59_0;$(IncludePath)</IncludePath>
+    <IncludePath>C:\Users\legoc\Documents\protobuf-2.6.1\src;$(ZEROMQ_HOME)\include;C:\local\boost_1_59_0;C:\Users\legoc\Documents;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <IncludePath>C:\Users\legoc\Documents\protobuf-2.6.1\src;$(ZEROMQ_HOME)\include;C:\local\boost_1_59_0;C:\Users\legoc\Documents;$(IncludePath)</IncludePath>