1
0
mirror of https://github.com/VCMP-SqMod/SqMod.git synced 2026-05-01 16:27:19 +02:00

Update WIP discord and some vendors.

CPR has features disabled and PCRE is fully disabled until updated to new code.
This commit is contained in:
Sandu Liviu Catalin
2023-08-05 21:31:33 +03:00
parent e0761bf3b9
commit 9298065cef
1562 changed files with 55070 additions and 76299 deletions
@@ -63,9 +63,6 @@
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
</ImportGroup>
<PropertyGroup>
<Option-tweet>true</Option-tweet>
</PropertyGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />
</ItemGroup>
@@ -79,4 +76,4 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
</Project>
</Project>
@@ -63,9 +63,6 @@
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
</ImportGroup>
<PropertyGroup>
<Option-tweet>true</Option-tweet>
</PropertyGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />
</ItemGroup>
@@ -79,4 +76,4 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
</Project>
</Project>
@@ -15,7 +15,6 @@
<ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions Condition="'$(Option-tweet)' == 'true'">ZMQ_USE_TWEETNACL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">ZMQ_USE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -61,4 +60,4 @@
<Message Text="Copying libzmq.pdb -&gt; $(TargetDir)libzmq.pdb" Importance="high" Condition="$(Configuration.IndexOf('Debug')) != -1" />
</Target>
</Project>
</Project>
+1 -6
View File
@@ -2,7 +2,6 @@
<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
<Rule Name="libzmq-options-uiextension" PageTemplate="tool" DisplayName="ZMQ Options" SwitchPrefix="/" Order="1">
<Rule.Categories>
<Category Name="tweet" DisplayName="tweet" />
<Category Name="sodium" DisplayName="sodium" />
<Category Name="openpgm" DisplayName="openpgm" />
<Category Name="gssapi" DisplayName="gssapi" />
@@ -11,10 +10,6 @@
<Rule.DataSource>
<DataSource Persistence="ProjectFile" ItemType="" />
</Rule.DataSource>
<EnumProperty Name="Option-tweet" DisplayName="Enable Tweet NaCl" Description="Enable the Tweet NaCl build option" Category="tweet">
<EnumValue Name="" DisplayName="No" />
<EnumValue Name="true" DisplayName="Yes" />
</EnumProperty>
<EnumProperty Name="Option-sodium" DisplayName="Enable Sodium" Description="Enable the Sodium build option" Category="sodium">
<EnumValue Name="" DisplayName="No" />
<EnumValue Name="true" DisplayName="Yes" />
@@ -46,4 +41,4 @@
<EnumValue Name="ltcg" DisplayName="Static using link time compile generation (LTCG)" />
</EnumProperty>
</Rule>
</ProjectSchemaDefinitions>
</ProjectSchemaDefinitions>
@@ -22,9 +22,8 @@
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>precompiled.hpp</PrecompiledHeaderFile>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;FD_SETSIZE=16384;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-tweet)' == 'true'">ZMQ_USE_TWEETNACL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">ZMQ_USE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-tweet)' == 'true' Or '$(Option-sodium)' == 'true'">ZMQ_HAVE_CURVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">ZMQ_HAVE_CURVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-draftapi)' == 'true'">ZMQ_BUILD_DRAFT_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -61,7 +60,6 @@
<!-- Messages -->
<Target Name="OptionInfo" BeforeTargets="PrepareForBuild">
<Message Text="Option-tweet : $(Option-tweet)" Importance="high"/>
<Message Text="Option-sodium : $(Option-sodium)" Importance="high"/>
<Message Text="Option-openpgm : $(Option-openpgm)" Importance="high"/>
<Message Text="Option-gssapi : $(Option-gssapi)" Importance="high"/>
@@ -73,4 +71,4 @@
<Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(Option-sodium)' == 'true'"/>
</Target>
</Project>
</Project>
@@ -66,9 +66,6 @@
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
</ImportGroup>
<PropertyGroup>
<Option-tweet>true</Option-tweet>
</PropertyGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />
<ClInclude Include="..\..\resource.h" />
@@ -159,7 +156,6 @@
<ClInclude Include="..\..\..\..\src\timers.hpp" />
<ClInclude Include="..\..\..\..\src\thread.hpp" />
<ClInclude Include="..\..\..\..\src\trie.hpp" />
<ClInclude Include="..\..\..\..\src\tweetnacl.h" />
<ClInclude Include="..\..\..\..\src\udp_address.hpp" />
<ClInclude Include="..\..\..\..\src\udp_engine.hpp" />
<ClInclude Include="..\..\..\..\src\v1_decoder.hpp" />
@@ -257,7 +253,6 @@
<ClCompile Include="..\..\..\..\src\thread.cpp" />
<ClCompile Include="..\..\..\..\src\timers.cpp" />
<ClCompile Include="..\..\..\..\src\trie.cpp" />
<ClCompile Include="..\..\..\..\src\tweetnacl.c">
<PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\..\..\..\src\udp_address.cpp" />
@@ -286,4 +281,4 @@
<ResourceCompile Include="..\..\resource.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</Project>
</Project>
@@ -265,9 +265,6 @@
<ClCompile Include="..\..\..\..\src\timers.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\tweetnacl.c">
<Filter>src</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\include\zmq.h">
@@ -573,9 +570,6 @@
<ClInclude Include="..\..\..\..\src\timers.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\tweetnacl.h">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\zmq_draft.h">
<Filter>src\include</Filter>
</ClInclude>
@@ -624,4 +618,4 @@
<Filter>resource</Filter>
</ResourceCompile>
</ItemGroup>
</Project>
</Project>
+1 -6
View File
@@ -2,7 +2,6 @@
<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
<Rule Name="libzmq-uiextension" PageTemplate="tool" DisplayName="ZMQ Options" SwitchPrefix="/" Order="1">
<Rule.Categories>
<Category Name="tweet" DisplayName="tweet" />
<Category Name="sodium" DisplayName="sodium" />
<Category Name="openpgm" DisplayName="openpgm" />
<Category Name="gssapi" DisplayName="gssapi" />
@@ -12,10 +11,6 @@
<Rule.DataSource>
<DataSource Persistence="ProjectFile" ItemType="" />
</Rule.DataSource>
<EnumProperty Name="Option-tweet" DisplayName="Enable Tweet NaCl" Description="Enable Tweet NaCl build option (overrides Sodium)" Category="tweet">
<EnumValue Name="" DisplayName="No" />
<EnumValue Name="true" DisplayName="Yes" />
</EnumProperty>
<EnumProperty Name="Option-sodium" DisplayName="Enable Sodium" Description="Enable Sodium build option" Category="sodium">
<EnumValue Name="" DisplayName="No" />
<EnumValue Name="true" DisplayName="Yes" />
@@ -37,4 +32,4 @@
<EnumValue Name="true" DisplayName="Yes" />
</EnumProperty>
</Rule>
</ProjectSchemaDefinitions>
</ProjectSchemaDefinitions>
@@ -63,9 +63,6 @@
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
</ImportGroup>
<PropertyGroup>
<Option-tweet>true</Option-tweet>
</PropertyGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />
</ItemGroup>
@@ -79,4 +76,4 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
</Project>
</Project>
@@ -63,9 +63,6 @@
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
</ImportGroup>
<PropertyGroup>
<Option-tweet>true</Option-tweet>
</PropertyGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />
</ItemGroup>
@@ -79,4 +76,4 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
</Project>
</Project>
@@ -63,9 +63,6 @@
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
</ImportGroup>
<PropertyGroup>
<Option-tweet>true</Option-tweet>
</PropertyGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />
</ItemGroup>
@@ -79,4 +76,4 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
</Project>
</Project>
@@ -63,9 +63,6 @@
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
</ImportGroup>
<PropertyGroup>
<Option-tweet>true</Option-tweet>
</PropertyGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />
</ItemGroup>
@@ -79,4 +76,4 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
</Project>
</Project>
@@ -63,9 +63,6 @@
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
</ImportGroup>
<PropertyGroup>
<Option-tweet>true</Option-tweet>
</PropertyGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />
</ItemGroup>
@@ -79,4 +76,4 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
</Project>
</Project>
@@ -63,9 +63,6 @@
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
</ImportGroup>
<PropertyGroup>
<Option-tweet>true</Option-tweet>
</PropertyGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />
</ItemGroup>
@@ -79,4 +76,4 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
</Project>
</Project>
@@ -15,7 +15,6 @@
<ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions Condition="'$(Option-tweet)' == 'true'">ZMQ_USE_TWEETNACL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">ZMQ_USE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -61,4 +60,4 @@
<Message Text="Copying libzmq.pdb -&gt; $(TargetDir)libzmq.pdb" Importance="high" Condition="$(Configuration.IndexOf('Debug')) != -1" />
</Target>
</Project>
</Project>
+1 -6
View File
@@ -2,7 +2,6 @@
<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
<Rule Name="libzmq-options-uiextension" PageTemplate="tool" DisplayName="ZMQ Options" SwitchPrefix="/" Order="1">
<Rule.Categories>
<Category Name="tweet" DisplayName="tweet" />
<Category Name="sodium" DisplayName="sodium" />
<Category Name="openpgm" DisplayName="openpgm" />
<Category Name="gssapi" DisplayName="gssapi" />
@@ -11,10 +10,6 @@
<Rule.DataSource>
<DataSource Persistence="ProjectFile" ItemType="" />
</Rule.DataSource>
<EnumProperty Name="Option-tweet" DisplayName="Enable Tweet NaCl" Description="Enable the Tweet NaCl build option" Category="tweet">
<EnumValue Name="" DisplayName="No" />
<EnumValue Name="true" DisplayName="Yes" />
</EnumProperty>
<EnumProperty Name="Option-sodium" DisplayName="Enable Sodium" Description="Enable the Sodium build option" Category="sodium">
<EnumValue Name="" DisplayName="No" />
<EnumValue Name="true" DisplayName="Yes" />
@@ -46,4 +41,4 @@
<EnumValue Name="ltcg" DisplayName="Static using link time compile generation (LTCG)" />
</EnumProperty>
</Rule>
</ProjectSchemaDefinitions>
</ProjectSchemaDefinitions>
@@ -22,9 +22,8 @@
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>precompiled.hpp</PrecompiledHeaderFile>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;FD_SETSIZE=16384;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-tweet)' == 'true'">ZMQ_USE_TWEETNACL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">ZMQ_USE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-tweet)' == 'true' Or '$(Option-sodium)' == 'true'">ZMQ_HAVE_CURVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">ZMQ_HAVE_CURVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-draftapi)' == 'true'">ZMQ_BUILD_DRAFT_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -61,7 +60,6 @@
<!-- Messages -->
<Target Name="OptionInfo" BeforeTargets="PrepareForBuild">
<Message Text="Option-tweet : $(Option-tweet)" Importance="high"/>
<Message Text="Option-sodium : $(Option-sodium)" Importance="high"/>
<Message Text="Option-openpgm : $(Option-openpgm)" Importance="high"/>
<Message Text="Option-gssapi : $(Option-gssapi)" Importance="high"/>
@@ -73,4 +71,4 @@
<Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(Option-sodium)' == 'true'"/>
</Target>
</Project>
</Project>
@@ -66,9 +66,6 @@
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
</ImportGroup>
<PropertyGroup>
<Option-tweet>true</Option-tweet>
</PropertyGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />
<ClInclude Include="..\..\resource.h" />
@@ -159,7 +156,6 @@
<ClInclude Include="..\..\..\..\src\timers.hpp" />
<ClInclude Include="..\..\..\..\src\thread.hpp" />
<ClInclude Include="..\..\..\..\src\trie.hpp" />
<ClInclude Include="..\..\..\..\src\tweetnacl.h" />
<ClInclude Include="..\..\..\..\src\udp_address.hpp" />
<ClInclude Include="..\..\..\..\src\udp_engine.hpp" />
<ClInclude Include="..\..\..\..\src\v1_decoder.hpp" />
@@ -257,9 +253,6 @@
<ClCompile Include="..\..\..\..\src\thread.cpp" />
<ClCompile Include="..\..\..\..\src\timers.cpp" />
<ClCompile Include="..\..\..\..\src\trie.cpp" />
<ClCompile Include="..\..\..\..\src\tweetnacl.c">
<PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\..\..\..\src\udp_address.cpp" />
<ClCompile Include="..\..\..\..\src\udp_engine.cpp" />
<ClCompile Include="..\..\..\..\src\v1_decoder.cpp" />
@@ -286,4 +279,4 @@
<ResourceCompile Include="..\..\resource.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</Project>
</Project>
@@ -265,9 +265,6 @@
<ClCompile Include="..\..\..\..\src\timers.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\tweetnacl.c">
<Filter>src</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\include\zmq.h">
@@ -573,9 +570,6 @@
<ClInclude Include="..\..\..\..\src\timers.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\tweetnacl.h">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\zmq_draft.h">
<Filter>src\include</Filter>
</ClInclude>
@@ -624,4 +618,4 @@
<Filter>resource</Filter>
</ResourceCompile>
</ItemGroup>
</Project>
</Project>
+1 -6
View File
@@ -2,7 +2,6 @@
<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
<Rule Name="libzmq-uiextension" PageTemplate="tool" DisplayName="ZMQ Options" SwitchPrefix="/" Order="1">
<Rule.Categories>
<Category Name="tweet" DisplayName="tweet" />
<Category Name="sodium" DisplayName="sodium" />
<Category Name="openpgm" DisplayName="openpgm" />
<Category Name="gssapi" DisplayName="gssapi" />
@@ -12,10 +11,6 @@
<Rule.DataSource>
<DataSource Persistence="ProjectFile" ItemType="" />
</Rule.DataSource>
<EnumProperty Name="Option-tweet" DisplayName="Enable Tweet NaCl" Description="Enable Tweet NaCl build option (overrides Sodium)" Category="tweet">
<EnumValue Name="" DisplayName="No" />
<EnumValue Name="true" DisplayName="Yes" />
</EnumProperty>
<EnumProperty Name="Option-sodium" DisplayName="Enable Sodium" Description="Enable Sodium build option" Category="sodium">
<EnumValue Name="" DisplayName="No" />
<EnumValue Name="true" DisplayName="Yes" />
@@ -37,4 +32,4 @@
<EnumValue Name="true" DisplayName="Yes" />
</EnumProperty>
</Rule>
</ProjectSchemaDefinitions>
</ProjectSchemaDefinitions>
@@ -63,9 +63,6 @@
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
</ImportGroup>
<PropertyGroup>
<Option-tweet>true</Option-tweet>
</PropertyGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />
</ItemGroup>
@@ -79,4 +76,4 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
</Project>
</Project>
@@ -63,9 +63,6 @@
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
</ImportGroup>
<PropertyGroup>
<Option-tweet>true</Option-tweet>
</PropertyGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />
</ItemGroup>
@@ -79,4 +76,4 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
</Project>
</Project>
@@ -63,9 +63,6 @@
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
</ImportGroup>
<PropertyGroup>
<Option-tweet>true</Option-tweet>
</PropertyGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />
</ItemGroup>
@@ -79,4 +76,4 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
</Project>
</Project>
@@ -63,9 +63,6 @@
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
</ImportGroup>
<PropertyGroup>
<Option-tweet>true</Option-tweet>
</PropertyGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />
</ItemGroup>
@@ -79,4 +76,4 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
</Project>
</Project>
@@ -63,9 +63,6 @@
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
</ImportGroup>
<PropertyGroup>
<Option-tweet>true</Option-tweet>
</PropertyGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />
</ItemGroup>
@@ -79,4 +76,4 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
</Project>
</Project>
@@ -63,9 +63,6 @@
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
</ImportGroup>
<PropertyGroup>
<Option-tweet>true</Option-tweet>
</PropertyGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />
</ItemGroup>
@@ -79,4 +76,4 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
</Project>
</Project>
@@ -15,7 +15,6 @@
<ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions Condition="'$(Option-tweet)' == 'true'">ZMQ_USE_TWEETNACL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">ZMQ_USE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -61,4 +60,4 @@
<Message Text="Copying libzmq.pdb -&gt; $(TargetDir)libzmq.pdb" Importance="high" Condition="$(Configuration.IndexOf('Debug')) != -1" />
</Target>
</Project>
</Project>
+1 -6
View File
@@ -2,7 +2,6 @@
<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
<Rule Name="libzmq-options-uiextension" PageTemplate="tool" DisplayName="ZMQ Options" SwitchPrefix="/" Order="1">
<Rule.Categories>
<Category Name="tweet" DisplayName="tweet" />
<Category Name="sodium" DisplayName="sodium" />
<Category Name="openpgm" DisplayName="openpgm" />
<Category Name="gssapi" DisplayName="gssapi" />
@@ -11,10 +10,6 @@
<Rule.DataSource>
<DataSource Persistence="ProjectFile" ItemType="" />
</Rule.DataSource>
<EnumProperty Name="Option-tweet" DisplayName="Enable Tweet NaCl" Description="Enable the Tweet NaCl build option" Category="tweet">
<EnumValue Name="" DisplayName="No" />
<EnumValue Name="true" DisplayName="Yes" />
</EnumProperty>
<EnumProperty Name="Option-sodium" DisplayName="Enable Sodium" Description="Enable the Sodium build option" Category="sodium">
<EnumValue Name="" DisplayName="No" />
<EnumValue Name="true" DisplayName="Yes" />
@@ -46,4 +41,4 @@
<EnumValue Name="ltcg" DisplayName="Static using link time compile generation (LTCG)" />
</EnumProperty>
</Rule>
</ProjectSchemaDefinitions>
</ProjectSchemaDefinitions>
@@ -22,9 +22,8 @@
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>precompiled.hpp</PrecompiledHeaderFile>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;FD_SETSIZE=16384;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-tweet)' == 'true'">ZMQ_USE_TWEETNACL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">ZMQ_USE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-tweet)' == 'true' Or '$(Option-sodium)' == 'true'">ZMQ_HAVE_CURVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">ZMQ_HAVE_CURVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-draftapi)' == 'true'">ZMQ_BUILD_DRAFT_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -61,7 +60,6 @@
<!-- Messages -->
<Target Name="OptionInfo" BeforeTargets="PrepareForBuild">
<Message Text="Option-tweet : $(Option-tweet)" Importance="high"/>
<Message Text="Option-sodium : $(Option-sodium)" Importance="high"/>
<Message Text="Option-openpgm : $(Option-openpgm)" Importance="high"/>
<Message Text="Option-gssapi : $(Option-gssapi)" Importance="high"/>
@@ -73,4 +71,4 @@
<Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(Option-sodium)' == 'true'"/>
</Target>
</Project>
</Project>
@@ -66,9 +66,6 @@
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
</ImportGroup>
<PropertyGroup>
<Option-tweet>true</Option-tweet>
</PropertyGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />
<ClInclude Include="..\..\resource.h" />
@@ -159,7 +156,6 @@
<ClInclude Include="..\..\..\..\src\timers.hpp" />
<ClInclude Include="..\..\..\..\src\thread.hpp" />
<ClInclude Include="..\..\..\..\src\trie.hpp" />
<ClInclude Include="..\..\..\..\src\tweetnacl.h" />
<ClInclude Include="..\..\..\..\src\udp_address.hpp" />
<ClInclude Include="..\..\..\..\src\udp_engine.hpp" />
<ClInclude Include="..\..\..\..\src\v1_decoder.hpp" />
@@ -257,9 +253,6 @@
<ClCompile Include="..\..\..\..\src\thread.cpp" />
<ClCompile Include="..\..\..\..\src\timers.cpp" />
<ClCompile Include="..\..\..\..\src\trie.cpp" />
<ClCompile Include="..\..\..\..\src\tweetnacl.c">
<PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\..\..\..\src\udp_address.cpp" />
<ClCompile Include="..\..\..\..\src\udp_engine.cpp" />
<ClCompile Include="..\..\..\..\src\v1_decoder.cpp" />
@@ -286,4 +279,4 @@
<ResourceCompile Include="..\..\resource.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</Project>
</Project>
@@ -265,9 +265,6 @@
<ClCompile Include="..\..\..\..\src\timers.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\tweetnacl.c">
<Filter>src</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\include\zmq.h">
@@ -573,9 +570,6 @@
<ClInclude Include="..\..\..\..\src\timers.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\tweetnacl.h">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\zmq_draft.h">
<Filter>src\include</Filter>
</ClInclude>
@@ -624,4 +618,4 @@
<Filter>resource</Filter>
</ResourceCompile>
</ItemGroup>
</Project>
</Project>
+1 -6
View File
@@ -2,7 +2,6 @@
<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
<Rule Name="libzmq-uiextension" PageTemplate="tool" DisplayName="ZMQ Options" SwitchPrefix="/" Order="1">
<Rule.Categories>
<Category Name="tweet" DisplayName="tweet" />
<Category Name="sodium" DisplayName="sodium" />
<Category Name="openpgm" DisplayName="openpgm" />
<Category Name="gssapi" DisplayName="gssapi" />
@@ -12,10 +11,6 @@
<Rule.DataSource>
<DataSource Persistence="ProjectFile" ItemType="" />
</Rule.DataSource>
<EnumProperty Name="Option-tweet" DisplayName="Enable Tweet NaCl" Description="Enable Tweet NaCl build option (overrides Sodium)" Category="tweet">
<EnumValue Name="" DisplayName="No" />
<EnumValue Name="true" DisplayName="Yes" />
</EnumProperty>
<EnumProperty Name="Option-sodium" DisplayName="Enable Sodium" Description="Enable Sodium build option" Category="sodium">
<EnumValue Name="" DisplayName="No" />
<EnumValue Name="true" DisplayName="Yes" />
@@ -37,4 +32,4 @@
<EnumValue Name="true" DisplayName="Yes" />
</EnumProperty>
</Rule>
</ProjectSchemaDefinitions>
</ProjectSchemaDefinitions>
@@ -63,9 +63,6 @@
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
</ImportGroup>
<PropertyGroup>
<Option-tweet>true</Option-tweet>
</PropertyGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />
</ItemGroup>
@@ -79,4 +76,4 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
</Project>
</Project>
@@ -63,9 +63,6 @@
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
</ImportGroup>
<PropertyGroup>
<Option-tweet>true</Option-tweet>
</PropertyGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />
</ItemGroup>
@@ -79,4 +76,4 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
</Project>
</Project>
@@ -63,9 +63,6 @@
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
</ImportGroup>
<PropertyGroup>
<Option-tweet>true</Option-tweet>
</PropertyGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />
</ItemGroup>
@@ -79,4 +76,4 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
</Project>
</Project>
@@ -63,9 +63,6 @@
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
</ImportGroup>
<PropertyGroup>
<Option-tweet>true</Option-tweet>
</PropertyGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />
</ItemGroup>
@@ -79,4 +76,4 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
</Project>
</Project>
@@ -63,9 +63,6 @@
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
</ImportGroup>
<PropertyGroup>
<Option-tweet>true</Option-tweet>
</PropertyGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />
</ItemGroup>
@@ -79,4 +76,4 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
</Project>
</Project>
@@ -63,9 +63,6 @@
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
</ImportGroup>
<PropertyGroup>
<Option-tweet>true</Option-tweet>
</PropertyGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />
</ItemGroup>
@@ -79,4 +76,4 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
</Project>
</Project>
@@ -15,7 +15,6 @@
<ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions Condition="'$(Option-tweet)' == 'true'">ZMQ_USE_TWEETNACL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">ZMQ_USE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -61,4 +60,4 @@
<Message Text="Copying libzmq.pdb -&gt; $(TargetDir)libzmq.pdb" Importance="high" Condition="$(Configuration.IndexOf('Debug')) != -1" />
</Target>
</Project>
</Project>
+1 -6
View File
@@ -2,7 +2,6 @@
<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
<Rule Name="libzmq-options-uiextension" PageTemplate="tool" DisplayName="ZMQ Options" SwitchPrefix="/" Order="1">
<Rule.Categories>
<Category Name="tweet" DisplayName="tweet" />
<Category Name="sodium" DisplayName="sodium" />
<Category Name="openpgm" DisplayName="openpgm" />
<Category Name="gssapi" DisplayName="gssapi" />
@@ -11,10 +10,6 @@
<Rule.DataSource>
<DataSource Persistence="ProjectFile" ItemType="" />
</Rule.DataSource>
<EnumProperty Name="Option-tweet" DisplayName="Enable Tweet NaCl" Description="Enable the Tweet NaCl build option" Category="tweet">
<EnumValue Name="" DisplayName="No" />
<EnumValue Name="true" DisplayName="Yes" />
</EnumProperty>
<EnumProperty Name="Option-sodium" DisplayName="Enable Sodium" Description="Enable the Sodium build option" Category="sodium">
<EnumValue Name="" DisplayName="No" />
<EnumValue Name="true" DisplayName="Yes" />
@@ -46,4 +41,4 @@
<EnumValue Name="ltcg" DisplayName="Static using link time compile generation (LTCG)" />
</EnumProperty>
</Rule>
</ProjectSchemaDefinitions>
</ProjectSchemaDefinitions>
@@ -22,9 +22,8 @@
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>precompiled.hpp</PrecompiledHeaderFile>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;FD_SETSIZE=16384;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-tweet)' == 'true'">ZMQ_USE_TWEETNACL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">ZMQ_USE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-tweet)' == 'true' Or '$(Option-sodium)' == 'true'">ZMQ_HAVE_CURVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">ZMQ_HAVE_CURVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-draftapi)' == 'true'">ZMQ_BUILD_DRAFT_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -61,7 +60,6 @@
<!-- Messages -->
<Target Name="OptionInfo" BeforeTargets="PrepareForBuild">
<Message Text="Option-tweet : $(Option-tweet)" Importance="high"/>
<Message Text="Option-sodium : $(Option-sodium)" Importance="high"/>
<Message Text="Option-openpgm : $(Option-openpgm)" Importance="high"/>
<Message Text="Option-gssapi : $(Option-gssapi)" Importance="high"/>
@@ -73,4 +71,4 @@
<Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(Option-sodium)' == 'true'"/>
</Target>
</Project>
</Project>
@@ -66,9 +66,6 @@
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
</ImportGroup>
<PropertyGroup>
<Option-tweet>true</Option-tweet>
</PropertyGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />
<ClInclude Include="..\..\resource.h" />
@@ -160,7 +157,6 @@
<ClInclude Include="..\..\..\..\src\timers.hpp" />
<ClInclude Include="..\..\..\..\src\thread.hpp" />
<ClInclude Include="..\..\..\..\src\trie.hpp" />
<ClInclude Include="..\..\..\..\src\tweetnacl.h" />
<ClInclude Include="..\..\..\..\src\udp_address.hpp" />
<ClInclude Include="..\..\..\..\src\udp_engine.hpp" />
<ClInclude Include="..\..\..\..\src\v1_decoder.hpp" />
@@ -259,9 +255,6 @@
<ClCompile Include="..\..\..\..\src\thread.cpp" />
<ClCompile Include="..\..\..\..\src\timers.cpp" />
<ClCompile Include="..\..\..\..\src\trie.cpp" />
<ClCompile Include="..\..\..\..\src\tweetnacl.c">
<PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\..\..\..\src\udp_address.cpp" />
<ClCompile Include="..\..\..\..\src\udp_engine.cpp" />
<ClCompile Include="..\..\..\..\src\v1_decoder.cpp" />
@@ -288,4 +281,4 @@
<ResourceCompile Include="..\..\resource.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</Project>
</Project>
@@ -265,9 +265,6 @@
<ClCompile Include="..\..\..\..\src\timers.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\tweetnacl.c">
<Filter>src</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\include\zmq.h">
@@ -573,9 +570,6 @@
<ClInclude Include="..\..\..\..\src\timers.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\tweetnacl.h">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\zmq_draft.h">
<Filter>src\include</Filter>
</ClInclude>
@@ -624,4 +618,4 @@
<Filter>resource</Filter>
</ResourceCompile>
</ItemGroup>
</Project>
</Project>
+1 -6
View File
@@ -2,7 +2,6 @@
<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
<Rule Name="libzmq-uiextension" PageTemplate="tool" DisplayName="ZMQ Options" SwitchPrefix="/" Order="1">
<Rule.Categories>
<Category Name="tweet" DisplayName="tweet" />
<Category Name="sodium" DisplayName="sodium" />
<Category Name="openpgm" DisplayName="openpgm" />
<Category Name="gssapi" DisplayName="gssapi" />
@@ -12,10 +11,6 @@
<Rule.DataSource>
<DataSource Persistence="ProjectFile" ItemType="" />
</Rule.DataSource>
<EnumProperty Name="Option-tweet" DisplayName="Enable Tweet NaCl" Description="Enable Tweet NaCl build option (overrides Sodium)" Category="tweet">
<EnumValue Name="" DisplayName="No" />
<EnumValue Name="true" DisplayName="Yes" />
</EnumProperty>
<EnumProperty Name="Option-sodium" DisplayName="Enable Sodium" Description="Enable Sodium build option" Category="sodium">
<EnumValue Name="" DisplayName="No" />
<EnumValue Name="true" DisplayName="Yes" />
@@ -37,4 +32,4 @@
<EnumValue Name="true" DisplayName="Yes" />
</EnumProperty>
</Rule>
</ProjectSchemaDefinitions>
</ProjectSchemaDefinitions>
@@ -63,9 +63,6 @@
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
</ImportGroup>
<PropertyGroup>
<Option-tweet>true</Option-tweet>
</PropertyGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />
</ItemGroup>
@@ -79,4 +76,4 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
</Project>
</Project>
@@ -63,9 +63,6 @@
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
</ImportGroup>
<PropertyGroup>
<Option-tweet>true</Option-tweet>
</PropertyGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />
</ItemGroup>
@@ -79,4 +76,4 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
</Project>
</Project>
@@ -63,9 +63,6 @@
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
</ImportGroup>
<PropertyGroup>
<Option-tweet>true</Option-tweet>
</PropertyGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />
</ItemGroup>
@@ -79,4 +76,4 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
</Project>
</Project>
@@ -63,9 +63,6 @@
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
</ImportGroup>
<PropertyGroup>
<Option-tweet>true</Option-tweet>
</PropertyGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />
</ItemGroup>
@@ -79,4 +76,4 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
</Project>
</Project>
@@ -22,7 +22,7 @@ send random size message to each socket and check server answer
#define CLIENT_COUNT 5 // client threads count
#define CLIENT_CONNECTION 100 // ZMQ_CLIENT sockets at each client
#define CLIENT_RECCONECT 1000 // reconnect one socket after messages
#define CLIENT_RECONNECT 1000 // reconnect one socket after messages
#define MESSAGE_MAX_SIZE 1024
@@ -157,7 +157,7 @@ void client(int num)
client_ready++;
while (client_ready < CLIENT_COUNT) Sleep(10); // wait while all clients open sockets
int recconect = 0;
int reconnect = 0;
while(1) {
int val[CLIENT_CONNECTION];
zmq_msg_t msg;
@@ -179,8 +179,8 @@ void client(int num)
client_cnt[num]++;
}
// reconnect one
recconect++;
if(recconect == CLIENT_RECCONECT) {
reconnect++;
if(reconnect == CLIENT_RECONNECT) {
int n = rand() % CLIENT_CONNECTION;
zmq_close(sock[n]);
sock[n] = zmq_socket(ctx, ZMQ_CLIENT); assert(sock[n]);
@@ -63,9 +63,6 @@
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
</ImportGroup>
<PropertyGroup>
<Option-tweet>true</Option-tweet>
</PropertyGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />
</ItemGroup>
@@ -79,4 +76,4 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
</Project>
</Project>
@@ -63,9 +63,6 @@
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
</ImportGroup>
<PropertyGroup>
<Option-tweet>true</Option-tweet>
</PropertyGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />
</ItemGroup>
@@ -79,4 +76,4 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
</Project>
</Project>
@@ -15,7 +15,6 @@
<ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions Condition="'$(Option-tweet)' == 'true'">ZMQ_USE_TWEETNACL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">ZMQ_USE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -61,4 +60,4 @@
<Message Text="Copying libzmq.pdb -&gt; $(TargetDir)libzmq.pdb" Importance="high" Condition="$(Configuration.IndexOf('Debug')) != -1" />
</Target>
</Project>
</Project>
+1 -6
View File
@@ -2,7 +2,6 @@
<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
<Rule Name="libzmq-options-uiextension" PageTemplate="tool" DisplayName="ZMQ Options" SwitchPrefix="/" Order="1">
<Rule.Categories>
<Category Name="tweet" DisplayName="tweet" />
<Category Name="sodium" DisplayName="sodium" />
<Category Name="openpgm" DisplayName="openpgm" />
<Category Name="gssapi" DisplayName="gssapi" />
@@ -11,10 +10,6 @@
<Rule.DataSource>
<DataSource Persistence="ProjectFile" ItemType="" />
</Rule.DataSource>
<EnumProperty Name="Option-tweet" DisplayName="Enable Tweet NaCl" Description="Enable the Tweet NaCl build option" Category="tweet">
<EnumValue Name="" DisplayName="No" />
<EnumValue Name="true" DisplayName="Yes" />
</EnumProperty>
<EnumProperty Name="Option-sodium" DisplayName="Enable Sodium" Description="Enable the Sodium build option" Category="sodium">
<EnumValue Name="" DisplayName="No" />
<EnumValue Name="true" DisplayName="Yes" />
@@ -46,4 +41,4 @@
<EnumValue Name="ltcg" DisplayName="Static using link time compile generation (LTCG)" />
</EnumProperty>
</Rule>
</ProjectSchemaDefinitions>
</ProjectSchemaDefinitions>
@@ -22,9 +22,8 @@
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>precompiled.hpp</PrecompiledHeaderFile>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;FD_SETSIZE=16384;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-tweet)' == 'true'">ZMQ_USE_TWEETNACL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">ZMQ_USE_LIBSODIUM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-tweet)' == 'true' Or '$(Option-sodium)' == 'true'">ZMQ_HAVE_CURVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-sodium)' == 'true'">ZMQ_HAVE_CURVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-draftapi)' == 'true'">ZMQ_BUILD_DRAFT_API;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -61,7 +60,6 @@
<!-- Messages -->
<Target Name="OptionInfo" BeforeTargets="PrepareForBuild">
<Message Text="Option-tweet : $(Option-tweet)" Importance="high"/>
<Message Text="Option-sodium : $(Option-sodium)" Importance="high"/>
<Message Text="Option-openpgm : $(Option-openpgm)" Importance="high"/>
<Message Text="Option-gssapi : $(Option-gssapi)" Importance="high"/>
@@ -73,4 +71,4 @@
<Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(Option-sodium)' == 'true'"/>
</Target>
</Project>
</Project>
@@ -66,9 +66,6 @@
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
</ImportGroup>
<PropertyGroup>
<Option-tweet>true</Option-tweet>
</PropertyGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />
<ClInclude Include="..\..\resource.h" />
@@ -159,7 +156,6 @@
<ClInclude Include="..\..\..\..\src\timers.hpp" />
<ClInclude Include="..\..\..\..\src\thread.hpp" />
<ClInclude Include="..\..\..\..\src\trie.hpp" />
<ClInclude Include="..\..\..\..\src\tweetnacl.h" />
<ClInclude Include="..\..\..\..\src\udp_address.hpp" />
<ClInclude Include="..\..\..\..\src\udp_engine.hpp" />
<ClInclude Include="..\..\..\..\src\v1_decoder.hpp" />
@@ -257,9 +253,6 @@
<ClCompile Include="..\..\..\..\src\thread.cpp" />
<ClCompile Include="..\..\..\..\src\timers.cpp" />
<ClCompile Include="..\..\..\..\src\trie.cpp" />
<ClCompile Include="..\..\..\..\src\tweetnacl.c">
<PrecompiledHeader>NotUsing</PrecompiledHeader>
</ClCompile>
<ClCompile Include="..\..\..\..\src\udp_address.cpp" />
<ClCompile Include="..\..\..\..\src\udp_engine.cpp" />
<ClCompile Include="..\..\..\..\src\v1_decoder.cpp" />
@@ -286,4 +279,4 @@
<ResourceCompile Include="..\..\resource.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</Project>
</Project>
@@ -265,9 +265,6 @@
<ClCompile Include="..\..\..\..\src\timers.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\tweetnacl.c">
<Filter>src</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\include\zmq.h">
@@ -573,9 +570,6 @@
<ClInclude Include="..\..\..\..\src\timers.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\tweetnacl.h">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\zmq_draft.h">
<Filter>src\include</Filter>
</ClInclude>
@@ -624,4 +618,4 @@
<Filter>resource</Filter>
</ResourceCompile>
</ItemGroup>
</Project>
</Project>
+1 -6
View File
@@ -2,7 +2,6 @@
<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
<Rule Name="libzmq-uiextension" PageTemplate="tool" DisplayName="ZMQ Options" SwitchPrefix="/" Order="1">
<Rule.Categories>
<Category Name="tweet" DisplayName="tweet" />
<Category Name="sodium" DisplayName="sodium" />
<Category Name="openpgm" DisplayName="openpgm" />
<Category Name="gssapi" DisplayName="gssapi" />
@@ -12,10 +11,6 @@
<Rule.DataSource>
<DataSource Persistence="ProjectFile" ItemType="" />
</Rule.DataSource>
<EnumProperty Name="Option-tweet" DisplayName="Enable Tweet NaCl" Description="Enable Tweet NaCl build option (overrides Sodium)" Category="tweet">
<EnumValue Name="" DisplayName="No" />
<EnumValue Name="true" DisplayName="Yes" />
</EnumProperty>
<EnumProperty Name="Option-sodium" DisplayName="Enable Sodium" Description="Enable Sodium build option" Category="sodium">
<EnumValue Name="" DisplayName="No" />
<EnumValue Name="true" DisplayName="Yes" />
@@ -37,4 +32,4 @@
<EnumValue Name="true" DisplayName="Yes" />
</EnumProperty>
</Rule>
</ProjectSchemaDefinitions>
</ProjectSchemaDefinitions>
@@ -63,9 +63,6 @@
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
</ImportGroup>
<PropertyGroup>
<Option-tweet>true</Option-tweet>
</PropertyGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />
</ItemGroup>
@@ -79,4 +76,4 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
</Project>
</Project>
@@ -63,9 +63,6 @@
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
</ImportGroup>
<PropertyGroup>
<Option-tweet>true</Option-tweet>
</PropertyGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />
</ItemGroup>
@@ -79,4 +76,4 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
</Project>
</Project>
@@ -63,9 +63,6 @@
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
</ImportGroup>
<PropertyGroup>
<Option-tweet>true</Option-tweet>
</PropertyGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />
</ItemGroup>
@@ -79,4 +76,4 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
</Project>
</Project>
@@ -63,9 +63,6 @@
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
</ImportGroup>
<PropertyGroup>
<Option-tweet>true</Option-tweet>
</PropertyGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />
</ItemGroup>
@@ -79,4 +76,4 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
</Project>
</Project>