github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-08-20 13:24:09 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Salsa20 SSE Windows build fix -- turns out you can't be as loose with SSE intrinsics in Visual Studio

Browse source
This commit is contained in:
Adam Ierymenko 2014-07-26 20:07:38 -07:00
commit f2d372545a
3 changed files with 24 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

8
windows/ZeroTierOne/ZeroTierOne.vcxproj
View file

@ -40,6 +40,7 @@
<ClCompile Include="..\..\node\PacketDecoder.cpp" />
<ClCompile Include="..\..\node\Peer.cpp" />
<ClCompile Include="..\..\node\Poly1305.cpp" />
<ClCompile Include="..\..\node\RoutingTable.cpp" />
<ClCompile Include="..\..\node\Salsa20.cpp" />
<ClCompile Include="..\..\node\Service.cpp" />
<ClCompile Include="..\..\node\SHA512.cpp" />
@ -51,7 +52,6 @@
<ClCompile Include="..\..\node\Topology.cpp" />
<ClCompile Include="..\..\node\UdpSocket.cpp" />
<ClCompile Include="..\..\node\Utils.cpp" />
<ClCompile Include="..\..\node\WindowsEthernetTap.cpp" />
<ClCompile Include="ServiceBase.cpp" />
<ClCompile Include="ServiceInstaller.cpp" />
<ClCompile Include="ZeroTierOneService.cpp" />
@ -93,6 +93,7 @@
<ClInclude Include="..\..\node\Path.hpp" />
<ClInclude Include="..\..\node\Peer.hpp" />
<ClInclude Include="..\..\node\Poly1305.hpp" />
<ClInclude Include="..\..\node\RoutingTable.hpp" />
<ClInclude Include="..\..\node\RuntimeEnvironment.hpp" />
<ClInclude Include="..\..\node\Salsa20.hpp" />
<ClInclude Include="..\..\node\Service.hpp" />
@ -108,7 +109,6 @@
<ClInclude Include="..\..\node\Topology.hpp" />
<ClInclude Include="..\..\node\UdpSocket.hpp" />
<ClInclude Include="..\..\node\Utils.hpp" />
<ClInclude Include="..\..\node\WindowsEthernetTap.hpp" />
<ClInclude Include="..\..\version.h" />
<ClInclude Include="resource.h" />
<ClInclude Include="ServiceBase.h" />
@ -221,7 +221,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>$(SolutionDir)\ext\bin\libcrypto\include</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ZT_OFFICIAL_RELEASE;ZT_AUTO_UPDATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>ZT_OFFICIAL_RELEASE;ZT_AUTO_UPDATE;ZT_SALSA20_SSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
<StringPooling>true</StringPooling>
@ -245,7 +245,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>$(SolutionDir)\ext\bin\libcrypto\include</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ZT_OFFICIAL_RELEASE;ZT_AUTO_UPDATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>ZT_OFFICIAL_RELEASE;ZT_AUTO_UPDATE;ZT_SALSA20_SSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
<StringPooling>true</StringPooling>

8
windows/ZeroTierOne/ZeroTierOne.vcxproj.filters
View file

@ -120,7 +120,7 @@
<ClCompile Include="..\..\node\TcpSocket.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\node\WindowsEthernetTap.cpp">
<ClCompile Include="..\..\node\RoutingTable.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
@ -287,15 +287,15 @@
<ClInclude Include="..\..\node\TcpSocket.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\node\WindowsEthernetTap.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\node\AntiRecursion.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\version.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\node\RoutingTable.hpp">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="ZeroTierOne.rc">