ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2024-12-23 23:02:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev

Browse Source
This commit is contained in:
Adam Ierymenko 2017-01-26 15:02:20 -08:00
commit 7c3984413e
4 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
java/jni/Android.mk
View File

@ -10,8 +10,6 @@ LOCAL_LDLIBS := -llog -latomic
# ZeroTierOne SDK source files # ZeroTierOne SDK source files
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
$(ZT1)/ext/lz4/lz4.c \
$(ZT1)/ext/http-parser/http_parser.c \
$(ZT1)/node/C25519.cpp \ $(ZT1)/node/C25519.cpp \
$(ZT1)/node/Capability.cpp \ $(ZT1)/node/Capability.cpp \
$(ZT1)/node/CertificateOfMembership.cpp \ $(ZT1)/node/CertificateOfMembership.cpp \
@ -36,8 +34,7 @@ LOCAL_SRC_FILES := \
$(ZT1)/node/Tag.cpp \ $(ZT1)/node/Tag.cpp \
$(ZT1)/node/Topology.cpp \ $(ZT1)/node/Topology.cpp \
$(ZT1)/node/Utils.cpp $(ZT1)/node/Utils.cpp
# $(ZT1)/osdep/Http.cpp \
# $(ZT1)/osdep/OSUtils.cpp
# JNI Files # JNI Files
LOCAL_SRC_FILES += \ LOCAL_SRC_FILES += \

2
windows/WinUI/WinUI.csproj
View File

@ -253,7 +253,7 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath)\Microsoft\Expression\Blend\.NETFramework\v4.5\Microsoft.Expression.Blend.WPF.targets" /> <Import Project="$(MSBuildExtensionsPath)\Microsoft\Expression\Blend\.NETFramework\v4.5\Microsoft.Expression.Blend.WPF.targets" />
<PropertyGroup> <PropertyGroup>
<PostBuildEvent>copy $(SolutionDir)\copyutil\bin\$(ConfigurationName)\copyutil.exe $(ProjectDir)\$(OutDir)\copyutil.exe</PostBuildEvent> <PostBuildEvent>copy "$(SolutionDir)\copyutil\bin\$(ConfigurationName)\copyutil.exe" "$(ProjectDir)\$(OutDir)\copyutil.exe"</PostBuildEvent>
</PropertyGroup> </PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.

2
windows/ZeroTierOne/ZeroTierOne.vcxproj
View File

@ -66,7 +66,6 @@
<ClCompile Include="..\..\one.cpp"> <ClCompile Include="..\..\one.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\osdep\BackgroundResolver.cpp" />
<ClCompile Include="..\..\osdep\Http.cpp" /> <ClCompile Include="..\..\osdep\Http.cpp" />
<ClCompile Include="..\..\osdep\ManagedRoute.cpp" /> <ClCompile Include="..\..\osdep\ManagedRoute.cpp" />
<ClCompile Include="..\..\osdep\OSUtils.cpp" /> <ClCompile Include="..\..\osdep\OSUtils.cpp" />
@ -142,7 +141,6 @@
<ClInclude Include="..\..\node\Topology.hpp" /> <ClInclude Include="..\..\node\Topology.hpp" />
<ClInclude Include="..\..\node\Utils.hpp" /> <ClInclude Include="..\..\node\Utils.hpp" />
<ClInclude Include="..\..\node\World.hpp" /> <ClInclude Include="..\..\node\World.hpp" />
<ClInclude Include="..\..\osdep\BackgroundResolver.hpp" />
<ClInclude Include="..\..\osdep\Binder.hpp" /> <ClInclude Include="..\..\osdep\Binder.hpp" />
<ClInclude Include="..\..\osdep\Http.hpp" /> <ClInclude Include="..\..\osdep\Http.hpp" />
<ClInclude Include="..\..\osdep\ManagedRoute.hpp" /> <ClInclude Include="..\..\osdep\ManagedRoute.hpp" />

6
windows/ZeroTierOne/ZeroTierOne.vcxproj.filters
View File

@ -165,9 +165,6 @@
<ClCompile Include="ZeroTierOneService.cpp"> <ClCompile Include="ZeroTierOneService.cpp">
<Filter>Source Files\windows\ZeroTierOne</Filter> <Filter>Source Files\windows\ZeroTierOne</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\osdep\BackgroundResolver.cpp">
<Filter>Source Files\osdep</Filter>
</ClCompile>
<ClCompile Include="..\..\node\Path.cpp"> <ClCompile Include="..\..\node\Path.cpp">
<Filter>Source Files\node</Filter> <Filter>Source Files\node</Filter>
</ClCompile> </ClCompile>
@ -398,9 +395,6 @@
<ClInclude Include="ZeroTierOneService.h"> <ClInclude Include="ZeroTierOneService.h">
<Filter>Header Files\windows\ZeroTierOne</Filter> <Filter>Header Files\windows\ZeroTierOne</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\osdep\BackgroundResolver.hpp">
<Filter>Header Files\osdep</Filter>
</ClInclude>
<ClInclude Include="..\..\node\BinarySemaphore.hpp"> <ClInclude Include="..\..\node\BinarySemaphore.hpp">
<Filter>Header Files\node</Filter> <Filter>Header Files\node</Filter>
</ClInclude> </ClInclude>