diff options
| -rw-r--r-- | java/jni/Android.mk | 5 | ||||
| -rw-r--r-- | windows/WinUI/WinUI.csproj | 2 | ||||
| -rw-r--r-- | windows/ZeroTierOne/ZeroTierOne.vcxproj | 2 | ||||
| -rw-r--r-- | windows/ZeroTierOne/ZeroTierOne.vcxproj.filters | 6 |
4 files changed, 2 insertions, 13 deletions
diff --git a/java/jni/Android.mk b/java/jni/Android.mk index e5d501f8..774c2015 100644 --- a/java/jni/Android.mk +++ b/java/jni/Android.mk @@ -10,8 +10,6 @@ LOCAL_LDLIBS := -llog -latomic # ZeroTierOne SDK source files LOCAL_SRC_FILES := \ - $(ZT1)/ext/lz4/lz4.c \ - $(ZT1)/ext/http-parser/http_parser.c \ $(ZT1)/node/C25519.cpp \ $(ZT1)/node/Capability.cpp \ $(ZT1)/node/CertificateOfMembership.cpp \ @@ -36,8 +34,7 @@ LOCAL_SRC_FILES := \ $(ZT1)/node/Tag.cpp \ $(ZT1)/node/Topology.cpp \ $(ZT1)/node/Utils.cpp -# $(ZT1)/osdep/Http.cpp \ -# $(ZT1)/osdep/OSUtils.cpp + # JNI Files LOCAL_SRC_FILES += \ diff --git a/windows/WinUI/WinUI.csproj b/windows/WinUI/WinUI.csproj index 4fcf1bc4..6b8013e0 100644 --- a/windows/WinUI/WinUI.csproj +++ b/windows/WinUI/WinUI.csproj @@ -253,7 +253,7 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildExtensionsPath)\Microsoft\Expression\Blend\.NETFramework\v4.5\Microsoft.Expression.Blend.WPF.targets" /> <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> <!-- 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. diff --git a/windows/ZeroTierOne/ZeroTierOne.vcxproj b/windows/ZeroTierOne/ZeroTierOne.vcxproj index 6a2ca520..7afdfb17 100644 --- a/windows/ZeroTierOne/ZeroTierOne.vcxproj +++ b/windows/ZeroTierOne/ZeroTierOne.vcxproj @@ -66,7 +66,6 @@ <ClCompile Include="..\..\one.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild> </ClCompile> - <ClCompile Include="..\..\osdep\BackgroundResolver.cpp" /> <ClCompile Include="..\..\osdep\Http.cpp" /> <ClCompile Include="..\..\osdep\ManagedRoute.cpp" /> <ClCompile Include="..\..\osdep\OSUtils.cpp" /> @@ -142,7 +141,6 @@ <ClInclude Include="..\..\node\Topology.hpp" /> <ClInclude Include="..\..\node\Utils.hpp" /> <ClInclude Include="..\..\node\World.hpp" /> - <ClInclude Include="..\..\osdep\BackgroundResolver.hpp" /> <ClInclude Include="..\..\osdep\Binder.hpp" /> <ClInclude Include="..\..\osdep\Http.hpp" /> <ClInclude Include="..\..\osdep\ManagedRoute.hpp" /> diff --git a/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters b/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters index ff3d4821..da673f61 100644 --- a/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters +++ b/windows/ZeroTierOne/ZeroTierOne.vcxproj.filters @@ -165,9 +165,6 @@ <ClCompile Include="ZeroTierOneService.cpp"> <Filter>Source Files\windows\ZeroTierOne</Filter> </ClCompile> - <ClCompile Include="..\..\osdep\BackgroundResolver.cpp"> - <Filter>Source Files\osdep</Filter> - </ClCompile> <ClCompile Include="..\..\node\Path.cpp"> <Filter>Source Files\node</Filter> </ClCompile> @@ -398,9 +395,6 @@ <ClInclude Include="ZeroTierOneService.h"> <Filter>Header Files\windows\ZeroTierOne</Filter> </ClInclude> - <ClInclude Include="..\..\osdep\BackgroundResolver.hpp"> - <Filter>Header Files\osdep</Filter> - </ClInclude> <ClInclude Include="..\..\node\BinarySemaphore.hpp"> <Filter>Header Files\node</Filter> </ClInclude> |