diff --git a/ext/installfiles/windows/Prerequisites/Visual C++ Redistributable for Visual Studio 2015-2022/VC_redist.x64.exe b/ext/installfiles/windows/Prerequisites/Visual C++ Redistributable for Visual Studio 2015-2022/VC_redist.x64.exe deleted file mode 100644 index 2a7fc6c95..000000000 Binary files a/ext/installfiles/windows/Prerequisites/Visual C++ Redistributable for Visual Studio 2015-2022/VC_redist.x64.exe and /dev/null differ diff --git a/ext/installfiles/windows/Prerequisites/Visual C++ Redistributable for Visual Studio 2015-2022/VC_redist.x86.exe b/ext/installfiles/windows/Prerequisites/Visual C++ Redistributable for Visual Studio 2015-2022/VC_redist.x86.exe deleted file mode 100644 index 189c5e21e..000000000 Binary files a/ext/installfiles/windows/Prerequisites/Visual C++ Redistributable for Visual Studio 2015-2022/VC_redist.x86.exe and /dev/null differ diff --git a/ext/installfiles/windows/ZeroTier One.aip b/ext/installfiles/windows/ZeroTier One.aip index 02a10108f..2f1fdc632 100644 --- a/ext/installfiles/windows/ZeroTier One.aip +++ b/ext/installfiles/windows/ZeroTier One.aip @@ -1,7 +1,7 @@ - + - + @@ -9,7 +9,7 @@ - + @@ -32,10 +32,10 @@ - + - + @@ -70,12 +70,10 @@ - - + - @@ -94,8 +92,6 @@ - - @@ -164,25 +160,19 @@ - - - - - - @@ -201,9 +191,7 @@ - - @@ -262,9 +250,6 @@ - - - @@ -282,9 +267,7 @@ - - @@ -299,13 +282,11 @@ - - @@ -314,9 +295,6 @@ - - - @@ -331,7 +309,6 @@ - @@ -377,8 +354,6 @@ - - @@ -393,7 +368,7 @@ - + @@ -422,12 +397,9 @@ - + - - - @@ -440,11 +412,6 @@ - - - - - @@ -479,10 +446,8 @@ - - @@ -501,12 +466,9 @@ - - - @@ -540,15 +502,7 @@ - - - - - - - - @@ -573,7 +527,7 @@ - + diff --git a/windows/ZeroTierOne/ZeroTierOne.vcxproj b/windows/ZeroTierOne/ZeroTierOne.vcxproj index bb1c0888a..8b2712d3f 100644 --- a/windows/ZeroTierOne/ZeroTierOne.vcxproj +++ b/windows/ZeroTierOne/ZeroTierOne.vcxproj @@ -302,7 +302,7 @@ v143 true MultiByte - false + Static Application @@ -310,7 +310,7 @@ v143 true MultiByte - false + Static Application @@ -547,7 +547,7 @@ true $(SolutionDir)\..\ext;$(SolutionDir)\..\zeroidc\target;%(AdditionalIncludeDirectories) ZT_SSO_ENABLED=1;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 true AnySuitable Speed @@ -583,7 +583,7 @@ true $(SolutionDir)\..\ext;$(SolutionDir)\..\zeroidc\target;%(AdditionalIncludeDirectories) ZT_SSO_ENABLED=1;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 + MultiThreaded NotSet true AnySuitable diff --git a/zeroidc/.cargo/config.toml b/zeroidc/.cargo/config.toml index 0e3f9951f..8a6660fea 100644 --- a/zeroidc/.cargo/config.toml +++ b/zeroidc/.cargo/config.toml @@ -10,8 +10,8 @@ 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.x86_64-pc-windows-msvc] +rustflags = ["-C", "target-feature=+crt-static"] -#[target.i686-pc-windows-msvc] -#rustflags = ["-C", "target-feature=+crt-static"] +[target.i686-pc-windows-msvc] +rustflags = ["-C", "target-feature=+crt-static"]