diff --git a/.gitignore b/.gitignore index cca0cd643..e5f6372dc 100755 --- a/.gitignore +++ b/.gitignore @@ -30,7 +30,6 @@ Thumbs.db /windows/WebUIWrapper/obj /windows/lib /ext/installfiles/windows/ZeroTier One-SetupFiles -/ext/installfiles/windows/Prerequisites /ext/installfiles/windows/*-cache /ZeroTier One.msi *.vcxproj.backup diff --git a/ext/installfiles/windows/Prerequisites/WebView2/MicrosoftEdgeWebview2Setup.exe b/ext/installfiles/windows/Prerequisites/WebView2/MicrosoftEdgeWebview2Setup.exe new file mode 100644 index 000000000..f24fedaeb Binary files /dev/null and b/ext/installfiles/windows/Prerequisites/WebView2/MicrosoftEdgeWebview2Setup.exe differ diff --git a/ext/installfiles/windows/ZeroTier One.aip b/ext/installfiles/windows/ZeroTier One.aip index b644027a8..e8a2388a3 100644 --- a/ext/installfiles/windows/ZeroTier One.aip +++ b/ext/installfiles/windows/ZeroTier One.aip @@ -1,5 +1,8 @@ - + + + + @@ -27,10 +30,10 @@ - + - + @@ -65,14 +68,11 @@ - - + - - @@ -84,10 +84,7 @@ - - - @@ -144,6 +141,9 @@ + + + @@ -153,27 +153,22 @@ + - - - - - - @@ -192,9 +187,7 @@ - - @@ -242,9 +235,6 @@ - - - @@ -256,6 +246,9 @@ + + + @@ -267,9 +260,7 @@ - - @@ -284,13 +275,11 @@ - - @@ -299,9 +288,6 @@ - - - @@ -315,7 +301,6 @@ - @@ -353,9 +338,6 @@ - - - @@ -372,7 +354,7 @@ - + @@ -401,10 +383,7 @@ - - - - + @@ -416,11 +395,6 @@ - - - - - @@ -438,10 +412,8 @@ - - @@ -460,16 +432,12 @@ - - - - @@ -501,17 +469,11 @@ - - - - + + - - - - - + @@ -536,7 +498,7 @@ - + diff --git a/windows/ZeroTierOne/ZeroTierOne.vcxproj b/windows/ZeroTierOne/ZeroTierOne.vcxproj index 6d370555f..e09a5cd05 100644 --- a/windows/ZeroTierOne/ZeroTierOne.vcxproj +++ b/windows/ZeroTierOne/ZeroTierOne.vcxproj @@ -407,7 +407,7 @@ true $(SolutionDir)\..\zeroidc\target;%(AdditionalIncludeDirectories) ZT_EXPORT;FD_SETSIZE=1024;STATICLIB;ZT_SALSA20_SSE;ZT_USE_MINIUPNPC;MINIUPNP_STATICLIB;WIN32;NOMINMAX;ZT_SOFTWARE_UPDATE_DEFAULT="apply";ZT_BUILD_PLATFORM=2;ZT_BUILD_ARCHITECTURE=1;%(PreprocessorDefinitions) - MultiThreadedDLL + MultiThreaded StreamingSIMDExtensions2 true AnySuitable @@ -421,6 +421,7 @@ false false true + false false @@ -440,8 +441,8 @@ true $(SolutionDir)\..\zeroidc\target;%(AdditionalIncludeDirectories) ZT_EXPORT;FD_SETSIZE=1024;STATICLIB;ZT_SOFTWARE_UPDATE_DEFAULT="apply";ZT_SALSA20_SSE;ZT_USE_MINIUPNPC;MINIUPNP_STATICLIB;WIN32;NOMINMAX;ZT_BUILD_PLATFORM=2;ZT_BUILD_ARCHITECTURE=2;%(PreprocessorDefinitions) - MultiThreadedDLL - StreamingSIMDExtensions2 + MultiThreaded + NotSet true AnySuitable Speed @@ -456,6 +457,7 @@ false false true + stdc11 false diff --git a/zeroidc/.cargo/config.toml b/zeroidc/.cargo/config.toml index b5447409e..5326b3647 100644 --- a/zeroidc/.cargo/config.toml +++ b/zeroidc/.cargo/config.toml @@ -3,3 +3,9 @@ rustflags=["-C", "link-arg=-mmacosx-version-min=10.13"] [target.aarch64-apple-darwin] rustflags=["-C", "link-arg=-mmacosx-version-min=10.13"] + +[target.x86_64-pc-windows-msvc] +rustflags = ["-C", "target-feature=+crt-static"] + +[target.i686-pc-windows-msvc] +rustflags = ["-C", "target-feature=+crt-static"]