diff options
| author | Adam Ierymenko <adam.ierymenko@zerotier.com> | 2017-04-18 11:00:29 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@zerotier.com> | 2017-04-18 11:00:29 -0700 |
| commit | 72bd3064a20aec9b1fcbc86bb590aca87f4eca71 (patch) | |
| tree | cad5b4aa1d572790d8903f74c90b34d2a782752c /windows | |
| parent | a1c316b9400c7f64e7359708560a0429883aad28 (diff) | |
| download | infinitytier-72bd3064a20aec9b1fcbc86bb590aca87f4eca71.tar.gz infinitytier-72bd3064a20aec9b1fcbc86bb590aca87f4eca71.zip | |
Windows build fixes, self test cleanup.
Diffstat (limited to 'windows')
| -rw-r--r-- | windows/ZeroTierOne/ZeroTierOne.vcxproj | 8 | ||||
| -rw-r--r-- | windows/ZeroTierOne/ZeroTierOne.vcxproj.filters | 21 |
2 files changed, 22 insertions, 7 deletions
diff --git a/windows/ZeroTierOne/ZeroTierOne.vcxproj b/windows/ZeroTierOne/ZeroTierOne.vcxproj index 84a44198..6ed95010 100644 --- a/windows/ZeroTierOne/ZeroTierOne.vcxproj +++ b/windows/ZeroTierOne/ZeroTierOne.vcxproj @@ -72,10 +72,7 @@ <ClCompile Include="..\..\node\Tag.cpp" /> <ClCompile Include="..\..\node\Topology.cpp" /> <ClCompile Include="..\..\node\Utils.cpp" /> - <ClCompile Include="..\..\one.cpp"> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild> - <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">false</ExcludedFromBuild> - </ClCompile> + <ClCompile Include="..\..\one.cpp" /> <ClCompile Include="..\..\osdep\Http.cpp" /> <ClCompile Include="..\..\osdep\ManagedRoute.cpp" /> <ClCompile Include="..\..\osdep\OSUtils.cpp" /> @@ -88,6 +85,8 @@ <ClCompile Include="ZeroTierOneService.cpp" /> </ItemGroup> <ItemGroup> + <ClInclude Include="..\..\controller\EmbeddedNetworkController.hpp" /> + <ClInclude Include="..\..\controller\JSONDB.hpp" /> <ClInclude Include="..\..\ext\http-parser\http_parser.h" /> <ClInclude Include="..\..\ext\json\json.hpp" /> <ClInclude Include="..\..\ext\libnatpmp\getgateway.h" /> @@ -109,6 +108,7 @@ <ClInclude Include="..\..\ext\miniupnpc\upnpdev.h" /> <ClInclude Include="..\..\ext\miniupnpc\upnperrors.h" /> <ClInclude Include="..\..\ext\miniupnpc\upnpreplyparse.h" /> + <ClInclude Include="..\..\ext\x64-salsa2012-asm\salsa2012.h" /> <ClInclude Include="..\..\include\ZeroTierOne.h" /> <ClInclude Include="..\..\node\Address.hpp" /> <ClInclude Include="..\..\node\Array.hpp" /> diff --git a/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters b/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters index b051b4f7..01637801 100644 --- a/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters +++ b/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters @@ -76,6 +76,12 @@ <Filter Include="Header Files\ext\json"> <UniqueIdentifier>{ff20532b-d9a2-440d-a7b4-b49e26a9b2f8}</UniqueIdentifier> </Filter> + <Filter Include="Header Files\ext\x64-salsa2012-asm"> + <UniqueIdentifier>{05d9cde8-03ae-4e37-b9f7-7417de98cbe9}</UniqueIdentifier> + </Filter> + <Filter Include="Header Files\controller"> + <UniqueIdentifier>{7dc22e9c-f869-41e7-b43d-f07f5b94f6fb}</UniqueIdentifier> + </Filter> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\service\OneService.cpp"> @@ -150,9 +156,6 @@ <ClCompile Include="..\..\ext\http-parser\http_parser.c"> <Filter>Source Files\ext\http-parser</Filter> </ClCompile> - <ClCompile Include="..\..\one.cpp"> - <Filter>Source Files</Filter> - </ClCompile> <ClCompile Include="ServiceBase.cpp"> <Filter>Source Files\windows\ZeroTierOne</Filter> </ClCompile> @@ -246,6 +249,9 @@ <ClCompile Include="..\..\node\CertificateOfOwnership.cpp"> <Filter>Source Files\node</Filter> </ClCompile> + <ClCompile Include="..\..\one.cpp"> + <Filter>Source Files</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="resource.h"> @@ -485,6 +491,15 @@ <ClInclude Include="..\..\node\Credential.hpp"> <Filter>Header Files\node</Filter> </ClInclude> + <ClInclude Include="..\..\ext\x64-salsa2012-asm\salsa2012.h"> + <Filter>Header Files\ext\x64-salsa2012-asm</Filter> + </ClInclude> + <ClInclude Include="..\..\controller\EmbeddedNetworkController.hpp"> + <Filter>Header Files\controller</Filter> + </ClInclude> + <ClInclude Include="..\..\controller\JSONDB.hpp"> + <Filter>Header Files\controller</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <ResourceCompile Include="ZeroTierOne.rc"> |