diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-07-13 10:51:19 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2017-07-13 10:51:19 -0700 |
| commit | 54893c35c113b2a1f2fab2fcbefed258c755c75e (patch) | |
| tree | 1ed6eca0319e24713624f1d95f46a020e53f60ad /windows | |
| parent | 495c5ce81ddb245e21f21325927236d0f666f6cf (diff) | |
| parent | 4cc773ec1bd768e8bc318135c548f94ae270e959 (diff) | |
| download | infinitytier-54893c35c113b2a1f2fab2fcbefed258c755c75e.tar.gz infinitytier-54893c35c113b2a1f2fab2fcbefed258c755c75e.zip | |
Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev
Diffstat (limited to 'windows')
| -rw-r--r-- | windows/ZeroTierOne/ZeroTierOne.vcxproj | 4 | ||||
| -rw-r--r-- | windows/ZeroTierOne/ZeroTierOne.vcxproj.filters | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/windows/ZeroTierOne/ZeroTierOne.vcxproj b/windows/ZeroTierOne/ZeroTierOne.vcxproj index f5102e11..af05be04 100644 --- a/windows/ZeroTierOne/ZeroTierOne.vcxproj +++ b/windows/ZeroTierOne/ZeroTierOne.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> @@ -70,6 +70,7 @@ <ClCompile Include="..\..\node\Switch.cpp" /> <ClCompile Include="..\..\node\Tag.cpp" /> <ClCompile Include="..\..\node\Topology.cpp" /> + <ClCompile Include="..\..\node\Trace.cpp" /> <ClCompile Include="..\..\node\Utils.cpp" /> <ClCompile Include="..\..\one.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild> @@ -163,6 +164,7 @@ <ClInclude Include="..\..\node\SharedPtr.hpp" /> <ClInclude Include="..\..\node\Switch.hpp" /> <ClInclude Include="..\..\node\Topology.hpp" /> + <ClInclude Include="..\..\node\Trace.hpp" /> <ClInclude Include="..\..\node\Utils.hpp" /> <ClInclude Include="..\..\node\World.hpp" /> <ClInclude Include="..\..\osdep\Binder.hpp" /> diff --git a/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters b/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters index 086c1043..504baa92 100644 --- a/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters +++ b/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters @@ -252,6 +252,9 @@ <ClCompile Include="..\..\selftest.cpp"> <Filter>Source Files</Filter> </ClCompile> + <ClCompile Include="..\..\node\Trace.cpp"> + <Filter>Source Files\node</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="resource.h"> @@ -497,6 +500,9 @@ <ClInclude Include="..\..\controller\JSONDB.hpp"> <Filter>Header Files\controller</Filter> </ClInclude> + <ClInclude Include="..\..\node\Trace.hpp"> + <Filter>Header Files\node</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <ResourceCompile Include="ZeroTierOne.rc"> |