diff --git a/appveyor.yml b/appveyor.yml index 9d0f5e69..5e6bff55 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ version: 1.0.20.{build} -os: Visual Studio 2019 +os: Visual Studio 2017 environment: matrix: diff --git a/builds/Makefile.am b/builds/Makefile.am index 25835423..23dfe9d2 100644 --- a/builds/Makefile.am +++ b/builds/Makefile.am @@ -25,7 +25,6 @@ EXTRA_DIST = \ msvc/properties/ReleaseSEXE.props \ msvc/properties/Win32.props \ msvc/properties/x64.props \ - msvc/properties/ARM64.props \ msvc/resource.h \ msvc/resource.rc \ msvc/version.h \ diff --git a/builds/msvc/build/buildbase.bat b/builds/msvc/build/buildbase.bat index d65a876a..93352732 100644 --- a/builds/msvc/build/buildbase.bat +++ b/builds/msvc/build/buildbase.bat @@ -93,31 +93,6 @@ ECHO Configuration=StaticRelease msbuild /m /v:n /p:Configuration=StaticRelease /p:Platform=x64 %solution% >> %log% IF errorlevel 1 GOTO error -@REM Build ARM64 packages only for Visual studio 19 and later -IF %version% == 16 ( - CALL !environment! x86_arm64 > nul - ECHO Platform=ARM64 - - ECHO Configuration=DynDebug - msbuild /m /v:n /p:Configuration=DynDebug /p:Platform=ARM64 %solution% >> %log% - IF errorlevel 1 GOTO error - ECHO Configuration=DynRelease - msbuild /m /v:n /p:Configuration=DynRelease /p:Platform=ARM64 %solution% >> %log% - IF errorlevel 1 GOTO error - ECHO Configuration=LtcgDebug - msbuild /m /v:n /p:Configuration=LtcgDebug /p:Platform=ARM64 %solution% >> %log% - IF errorlevel 1 GOTO error - ECHO Configuration=LtcgRelease - msbuild /m /v:n /p:Configuration=LtcgRelease /p:Platform=ARM64 %solution% >> %log% - IF errorlevel 1 GOTO error - ECHO Configuration=StaticDebug - msbuild /m /v:n /p:Configuration=StaticDebug /p:Platform=ARM64 %solution% >> %log% - IF errorlevel 1 GOTO error - ECHO Configuration=StaticRelease - msbuild /m /v:n /p:Configuration=StaticRelease /p:Platform=ARM64 %solution% >> %log% - IF errorlevel 1 GOTO error -) - ECHO Complete: %solution% GOTO end diff --git a/builds/msvc/properties/ARM64.props b/builds/msvc/properties/ARM64.props deleted file mode 100644 index 34b58ae4..00000000 --- a/builds/msvc/properties/ARM64.props +++ /dev/null @@ -1,18 +0,0 @@ - - - - <_PropertySheetDisplayName>ARM64 Settings - - - - WIN32;_WIN32;%(PreprocessorDefinitions) - - - MachineARM64 - - - /MACHINE:ARM64 %(AdditionalOptions) - - - - diff --git a/builds/msvc/vs2010/libsodium/libsodium.vcxproj b/builds/msvc/vs2010/libsodium/libsodium.vcxproj index 939ef425..d4a01ac7 100644 --- a/builds/msvc/vs2010/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2010/libsodium/libsodium.vcxproj @@ -10,50 +10,50 @@ DebugDLL Win32 - - DebugDLL - x64 - ReleaseDLL Win32 + + DebugDLL + x64 + ReleaseDLL x64 - - DebugLIB - Win32 - - - DebugLIB - x64 - - - ReleaseLIB - Win32 - - - ReleaseLIB - x64 - DebugLTCG Win32 - - DebugLTCG - x64 - ReleaseLTCG Win32 + + DebugLTCG + x64 + ReleaseLTCG x64 + + DebugLIB + Win32 + + + ReleaseLIB + Win32 + + + DebugLIB + x64 + + + ReleaseLIB + x64 + StaticLibrary @@ -169,9 +169,9 @@ - - - + + + @@ -320,10 +320,11 @@ - - - - + + + + + diff --git a/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters index b730d701..fd834ec7 100644 --- a/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters +++ b/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters @@ -330,14 +330,14 @@ crypto_aead\aegis256 - - crypto_aead\aegis256\aesni + + crypto_aead\aegis256 - - crypto_aead\aegis256\soft + + crypto_aead\aegis256 - - crypto_aead\aegis256\armcrypto + + crypto_aead\aegis256 crypto_aead\aes256gcm @@ -779,17 +779,20 @@ crypto_aead\aegis128l - + crypto_aead\aegis256 - - crypto_aead\aegis256\aesni + + crypto_aead\aegis256 - - crypto_aead\aegis256\soft + + crypto_aead\aegis256 - - crypto_aead\aegis256\armcrypto + + crypto_aead\aegis256 + + + crypto_aead\aegis256 crypto_core\ed25519 @@ -829,15 +832,6 @@ {6897a4cc-0091-3970-b712-c0ac75c16b67} - - {53f55581-bb1c-3fe5-8c1b-1dd4243765ef} - - - {d8e5d430-b695-3e19-81bd-31fd1e6445da} - - - {853de148-043c-36b2-9cf8-1aa4541da046} - {3e53394c-b59c-30cc-ae69-a4f46f9edfa3} diff --git a/builds/msvc/vs2012/libsodium/libsodium.vcxproj b/builds/msvc/vs2012/libsodium/libsodium.vcxproj index b27c8808..aab046e7 100644 --- a/builds/msvc/vs2012/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2012/libsodium/libsodium.vcxproj @@ -10,50 +10,50 @@ DebugDLL Win32 - - DebugDLL - x64 - ReleaseDLL Win32 + + DebugDLL + x64 + ReleaseDLL x64 - - DebugLIB - Win32 - - - DebugLIB - x64 - - - ReleaseLIB - Win32 - - - ReleaseLIB - x64 - DebugLTCG Win32 - - DebugLTCG - x64 - ReleaseLTCG Win32 + + DebugLTCG + x64 + ReleaseLTCG x64 + + DebugLIB + Win32 + + + ReleaseLIB + Win32 + + + DebugLIB + x64 + + + ReleaseLIB + x64 + StaticLibrary @@ -169,9 +169,9 @@ - - - + + + @@ -320,10 +320,11 @@ - - - - + + + + + diff --git a/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters index b730d701..fd834ec7 100644 --- a/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters +++ b/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters @@ -330,14 +330,14 @@ crypto_aead\aegis256 - - crypto_aead\aegis256\aesni + + crypto_aead\aegis256 - - crypto_aead\aegis256\soft + + crypto_aead\aegis256 - - crypto_aead\aegis256\armcrypto + + crypto_aead\aegis256 crypto_aead\aes256gcm @@ -779,17 +779,20 @@ crypto_aead\aegis128l - + crypto_aead\aegis256 - - crypto_aead\aegis256\aesni + + crypto_aead\aegis256 - - crypto_aead\aegis256\soft + + crypto_aead\aegis256 - - crypto_aead\aegis256\armcrypto + + crypto_aead\aegis256 + + + crypto_aead\aegis256 crypto_core\ed25519 @@ -829,15 +832,6 @@ {6897a4cc-0091-3970-b712-c0ac75c16b67} - - {53f55581-bb1c-3fe5-8c1b-1dd4243765ef} - - - {d8e5d430-b695-3e19-81bd-31fd1e6445da} - - - {853de148-043c-36b2-9cf8-1aa4541da046} - {3e53394c-b59c-30cc-ae69-a4f46f9edfa3} diff --git a/builds/msvc/vs2013/libsodium/libsodium.vcxproj b/builds/msvc/vs2013/libsodium/libsodium.vcxproj index 2bc8cc39..5c788b78 100644 --- a/builds/msvc/vs2013/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2013/libsodium/libsodium.vcxproj @@ -10,50 +10,50 @@ DebugDLL Win32 - - DebugDLL - x64 - ReleaseDLL Win32 + + DebugDLL + x64 + ReleaseDLL x64 - - DebugLIB - Win32 - - - DebugLIB - x64 - - - ReleaseLIB - Win32 - - - ReleaseLIB - x64 - DebugLTCG Win32 - - DebugLTCG - x64 - ReleaseLTCG Win32 + + DebugLTCG + x64 + ReleaseLTCG x64 + + DebugLIB + Win32 + + + ReleaseLIB + Win32 + + + DebugLIB + x64 + + + ReleaseLIB + x64 + StaticLibrary @@ -169,9 +169,9 @@ - - - + + + @@ -320,10 +320,11 @@ - - - - + + + + + diff --git a/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters index b730d701..fd834ec7 100644 --- a/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters +++ b/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters @@ -330,14 +330,14 @@ crypto_aead\aegis256 - - crypto_aead\aegis256\aesni + + crypto_aead\aegis256 - - crypto_aead\aegis256\soft + + crypto_aead\aegis256 - - crypto_aead\aegis256\armcrypto + + crypto_aead\aegis256 crypto_aead\aes256gcm @@ -779,17 +779,20 @@ crypto_aead\aegis128l - + crypto_aead\aegis256 - - crypto_aead\aegis256\aesni + + crypto_aead\aegis256 - - crypto_aead\aegis256\soft + + crypto_aead\aegis256 - - crypto_aead\aegis256\armcrypto + + crypto_aead\aegis256 + + + crypto_aead\aegis256 crypto_core\ed25519 @@ -829,15 +832,6 @@ {6897a4cc-0091-3970-b712-c0ac75c16b67} - - {53f55581-bb1c-3fe5-8c1b-1dd4243765ef} - - - {d8e5d430-b695-3e19-81bd-31fd1e6445da} - - - {853de148-043c-36b2-9cf8-1aa4541da046} - {3e53394c-b59c-30cc-ae69-a4f46f9edfa3} diff --git a/builds/msvc/vs2015/libsodium/libsodium.vcxproj b/builds/msvc/vs2015/libsodium/libsodium.vcxproj index f756ca7d..276d773f 100644 --- a/builds/msvc/vs2015/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2015/libsodium/libsodium.vcxproj @@ -10,50 +10,50 @@ DebugDLL Win32 - - DebugDLL - x64 - ReleaseDLL Win32 + + DebugDLL + x64 + ReleaseDLL x64 - - DebugLIB - Win32 - - - DebugLIB - x64 - - - ReleaseLIB - Win32 - - - ReleaseLIB - x64 - DebugLTCG Win32 - - DebugLTCG - x64 - ReleaseLTCG Win32 + + DebugLTCG + x64 + ReleaseLTCG x64 + + DebugLIB + Win32 + + + ReleaseLIB + Win32 + + + DebugLIB + x64 + + + ReleaseLIB + x64 + StaticLibrary @@ -169,9 +169,9 @@ - - - + + + @@ -320,10 +320,11 @@ - - - - + + + + + diff --git a/builds/msvc/vs2015/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2015/libsodium/libsodium.vcxproj.filters index b730d701..fd834ec7 100644 --- a/builds/msvc/vs2015/libsodium/libsodium.vcxproj.filters +++ b/builds/msvc/vs2015/libsodium/libsodium.vcxproj.filters @@ -330,14 +330,14 @@ crypto_aead\aegis256 - - crypto_aead\aegis256\aesni + + crypto_aead\aegis256 - - crypto_aead\aegis256\soft + + crypto_aead\aegis256 - - crypto_aead\aegis256\armcrypto + + crypto_aead\aegis256 crypto_aead\aes256gcm @@ -779,17 +779,20 @@ crypto_aead\aegis128l - + crypto_aead\aegis256 - - crypto_aead\aegis256\aesni + + crypto_aead\aegis256 - - crypto_aead\aegis256\soft + + crypto_aead\aegis256 - - crypto_aead\aegis256\armcrypto + + crypto_aead\aegis256 + + + crypto_aead\aegis256 crypto_core\ed25519 @@ -829,15 +832,6 @@ {6897a4cc-0091-3970-b712-c0ac75c16b67} - - {53f55581-bb1c-3fe5-8c1b-1dd4243765ef} - - - {d8e5d430-b695-3e19-81bd-31fd1e6445da} - - - {853de148-043c-36b2-9cf8-1aa4541da046} - {3e53394c-b59c-30cc-ae69-a4f46f9edfa3} diff --git a/builds/msvc/vs2017/libsodium/libsodium.vcxproj b/builds/msvc/vs2017/libsodium/libsodium.vcxproj index 718a9fef..e902b391 100644 --- a/builds/msvc/vs2017/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2017/libsodium/libsodium.vcxproj @@ -10,50 +10,50 @@ DebugDLL Win32 - - DebugDLL - x64 - ReleaseDLL Win32 + + DebugDLL + x64 + ReleaseDLL x64 - - DebugLIB - Win32 - - - DebugLIB - x64 - - - ReleaseLIB - Win32 - - - ReleaseLIB - x64 - DebugLTCG Win32 - - DebugLTCG - x64 - ReleaseLTCG Win32 + + DebugLTCG + x64 + ReleaseLTCG x64 + + DebugLIB + Win32 + + + ReleaseLIB + Win32 + + + DebugLIB + x64 + + + ReleaseLIB + x64 + StaticLibrary @@ -169,9 +169,9 @@ - - - + + + @@ -320,10 +320,11 @@ - - - - + + + + + diff --git a/builds/msvc/vs2017/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2017/libsodium/libsodium.vcxproj.filters index b730d701..fd834ec7 100644 --- a/builds/msvc/vs2017/libsodium/libsodium.vcxproj.filters +++ b/builds/msvc/vs2017/libsodium/libsodium.vcxproj.filters @@ -330,14 +330,14 @@ crypto_aead\aegis256 - - crypto_aead\aegis256\aesni + + crypto_aead\aegis256 - - crypto_aead\aegis256\soft + + crypto_aead\aegis256 - - crypto_aead\aegis256\armcrypto + + crypto_aead\aegis256 crypto_aead\aes256gcm @@ -779,17 +779,20 @@ crypto_aead\aegis128l - + crypto_aead\aegis256 - - crypto_aead\aegis256\aesni + + crypto_aead\aegis256 - - crypto_aead\aegis256\soft + + crypto_aead\aegis256 - - crypto_aead\aegis256\armcrypto + + crypto_aead\aegis256 + + + crypto_aead\aegis256 crypto_core\ed25519 @@ -829,15 +832,6 @@ {6897a4cc-0091-3970-b712-c0ac75c16b67} - - {53f55581-bb1c-3fe5-8c1b-1dd4243765ef} - - - {d8e5d430-b695-3e19-81bd-31fd1e6445da} - - - {853de148-043c-36b2-9cf8-1aa4541da046} - {3e53394c-b59c-30cc-ae69-a4f46f9edfa3} diff --git a/builds/msvc/vs2019/libsodium.sln b/builds/msvc/vs2019/libsodium.sln index 43296cb0..0f3f7306 100644 --- a/builds/msvc/vs2019/libsodium.sln +++ b/builds/msvc/vs2019/libsodium.sln @@ -9,60 +9,42 @@ Global GlobalSection(SolutionConfigurationPlatforms) = preSolution DynDebug|Win32 = DynDebug|Win32 DynDebug|x64 = DynDebug|x64 - DynDebug|ARM64 = DynDebug|ARM64 DynRelease|Win32 = DynRelease|Win32 DynRelease|x64 = DynRelease|x64 - DynRelease|ARM64 = DynRelease|ARM64 LtcgDebug|Win32 = LtcgDebug|Win32 LtcgDebug|x64 = LtcgDebug|x64 - LtcgDebug|ARM64 = LtcgDebug|ARM64 LtcgRelease|Win32 = LtcgRelease|Win32 LtcgRelease|x64 = LtcgRelease|x64 - LtcgRelease|ARM64 = LtcgRelease|ARM64 StaticDebug|Win32 = StaticDebug|Win32 StaticDebug|x64 = StaticDebug|x64 - StaticDebug|ARM64 = StaticDebug|ARM64 StaticRelease|Win32 = StaticRelease|Win32 StaticRelease|x64 = StaticRelease|x64 - StaticRelease|ARM64 = StaticRelease|ARM64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynDebug|Win32.ActiveCfg = DebugDLL|Win32 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynDebug|Win32.Build.0 = DebugDLL|Win32 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynDebug|x64.ActiveCfg = DebugDLL|x64 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynDebug|x64.Build.0 = DebugDLL|x64 - {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynDebug|ARM64.ActiveCfg = DebugDLL|ARM64 - {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynDebug|ARM64.Build.0 = DebugDLL|ARM64 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynRelease|Win32.ActiveCfg = ReleaseDLL|Win32 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynRelease|Win32.Build.0 = ReleaseDLL|Win32 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynRelease|x64.ActiveCfg = ReleaseDLL|x64 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynRelease|x64.Build.0 = ReleaseDLL|x64 - {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynRelease|ARM64.ActiveCfg = ReleaseDLL|ARM64 - {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DynRelease|ARM64.Build.0 = ReleaseDLL|ARM64 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgDebug|Win32.ActiveCfg = DebugLTCG|Win32 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgDebug|Win32.Build.0 = DebugLTCG|Win32 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgDebug|x64.ActiveCfg = DebugLTCG|x64 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgDebug|x64.Build.0 = DebugLTCG|x64 - {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgDebug|ARM64.ActiveCfg = DebugLTCG|ARM64 - {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgDebug|ARM64.Build.0 = DebugLTCG|ARM64 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgRelease|Win32.ActiveCfg = ReleaseLTCG|Win32 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgRelease|Win32.Build.0 = ReleaseLTCG|Win32 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgRelease|x64.ActiveCfg = ReleaseLTCG|x64 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgRelease|x64.Build.0 = ReleaseLTCG|x64 - {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgRelease|ARM64.ActiveCfg = ReleaseLTCG|ARM64 - {A185B162-6CB6-4502-B03F-B56F7699A8D9}.LtcgRelease|ARM64.Build.0 = ReleaseLTCG|ARM64 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticDebug|Win32.ActiveCfg = DebugLIB|Win32 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticDebug|Win32.Build.0 = DebugLIB|Win32 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticDebug|x64.ActiveCfg = DebugLIB|x64 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticDebug|x64.Build.0 = DebugLIB|x64 - {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticDebug|ARM64.ActiveCfg = DebugLIB|ARM64 - {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticDebug|ARM64.Build.0 = DebugLIB|ARM64 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticRelease|Win32.ActiveCfg = ReleaseLIB|Win32 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticRelease|Win32.Build.0 = ReleaseLIB|Win32 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticRelease|x64.ActiveCfg = ReleaseLIB|x64 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticRelease|x64.Build.0 = ReleaseLIB|x64 - {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticRelease|ARM64.ActiveCfg = ReleaseLIB|ARM64 - {A185B162-6CB6-4502-B03F-B56F7699A8D9}.StaticRelease|ARM64.Build.0 = ReleaseLIB|ARM64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/builds/msvc/vs2019/libsodium/libsodium.vcxproj b/builds/msvc/vs2019/libsodium/libsodium.vcxproj index 5af6d084..5a482569 100644 --- a/builds/msvc/vs2019/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2019/libsodium/libsodium.vcxproj @@ -10,73 +10,49 @@ DebugDLL Win32 - - DebugDLL - x64 - - - DebugDLL - ARM64 - ReleaseDLL Win32 + + DebugDLL + x64 + ReleaseDLL x64 - - ReleaseDLL - ARM64 - - - DebugLIB - Win32 - - - DebugLIB - x64 - - - DebugLIB - ARM64 - - - ReleaseLIB - Win32 - - - ReleaseLIB - x64 - - - ReleaseLIB - ARM64 - DebugLTCG Win32 + + ReleaseLTCG + Win32 + DebugLTCG x64 - - DebugLTCG - ARM64 - - - ReleaseLTCG - Win32 - ReleaseLTCG x64 - - ReleaseLTCG - ARM64 + + DebugLIB + Win32 + + + ReleaseLIB + Win32 + + + DebugLIB + x64 + + + ReleaseLIB + x64 @@ -193,9 +169,9 @@ - - - + + + @@ -344,10 +320,11 @@ - - - - + + + + + diff --git a/builds/msvc/vs2019/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2019/libsodium/libsodium.vcxproj.filters index b730d701..fd834ec7 100644 --- a/builds/msvc/vs2019/libsodium/libsodium.vcxproj.filters +++ b/builds/msvc/vs2019/libsodium/libsodium.vcxproj.filters @@ -330,14 +330,14 @@ crypto_aead\aegis256 - - crypto_aead\aegis256\aesni + + crypto_aead\aegis256 - - crypto_aead\aegis256\soft + + crypto_aead\aegis256 - - crypto_aead\aegis256\armcrypto + + crypto_aead\aegis256 crypto_aead\aes256gcm @@ -779,17 +779,20 @@ crypto_aead\aegis128l - + crypto_aead\aegis256 - - crypto_aead\aegis256\aesni + + crypto_aead\aegis256 - - crypto_aead\aegis256\soft + + crypto_aead\aegis256 - - crypto_aead\aegis256\armcrypto + + crypto_aead\aegis256 + + + crypto_aead\aegis256 crypto_core\ed25519 @@ -829,15 +832,6 @@ {6897a4cc-0091-3970-b712-c0ac75c16b67} - - {53f55581-bb1c-3fe5-8c1b-1dd4243765ef} - - - {d8e5d430-b695-3e19-81bd-31fd1e6445da} - - - {853de148-043c-36b2-9cf8-1aa4541da046} - {3e53394c-b59c-30cc-ae69-a4f46f9edfa3} diff --git a/builds/msvc/vs2022/libsodium/libsodium.vcxproj b/builds/msvc/vs2022/libsodium/libsodium.vcxproj index a3c2168d..8330666e 100644 --- a/builds/msvc/vs2022/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2022/libsodium/libsodium.vcxproj @@ -6,7 +6,54 @@ v143 - {{ProjectConfigurations}} + + DebugDLL + Win32 + + + ReleaseDLL + Win32 + + + DebugDLL + x64 + + + ReleaseDLL + x64 + + + DebugLTCG + Win32 + + + ReleaseLTCG + Win32 + + + DebugLTCG + x64 + + + ReleaseLTCG + x64 + + + DebugLIB + Win32 + + + ReleaseLIB + Win32 + + + DebugLIB + x64 + + + ReleaseLIB + x64 + StaticLibrary @@ -122,9 +169,9 @@ - - - + + + @@ -273,10 +320,11 @@ - - - - + + + + + diff --git a/builds/msvc/vs2022/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2022/libsodium/libsodium.vcxproj.filters index b730d701..fd834ec7 100644 --- a/builds/msvc/vs2022/libsodium/libsodium.vcxproj.filters +++ b/builds/msvc/vs2022/libsodium/libsodium.vcxproj.filters @@ -330,14 +330,14 @@ crypto_aead\aegis256 - - crypto_aead\aegis256\aesni + + crypto_aead\aegis256 - - crypto_aead\aegis256\soft + + crypto_aead\aegis256 - - crypto_aead\aegis256\armcrypto + + crypto_aead\aegis256 crypto_aead\aes256gcm @@ -779,17 +779,20 @@ crypto_aead\aegis128l - + crypto_aead\aegis256 - - crypto_aead\aegis256\aesni + + crypto_aead\aegis256 - - crypto_aead\aegis256\soft + + crypto_aead\aegis256 - - crypto_aead\aegis256\armcrypto + + crypto_aead\aegis256 + + + crypto_aead\aegis256 crypto_core\ed25519 @@ -829,15 +832,6 @@ {6897a4cc-0091-3970-b712-c0ac75c16b67} - - {53f55581-bb1c-3fe5-8c1b-1dd4243765ef} - - - {d8e5d430-b695-3e19-81bd-31fd1e6445da} - - - {853de148-043c-36b2-9cf8-1aa4541da046} - {3e53394c-b59c-30cc-ae69-a4f46f9edfa3} diff --git a/libsodium.sln b/libsodium.sln index 500f7d94..f5808c66 100644 --- a/libsodium.sln +++ b/libsodium.sln @@ -1,46 +1,34 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.31424.327 +# Visual Studio 14 +VisualStudioVersion = 14.0.23107.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsodium", "libsodium.vcxproj", "{A185B162-6CB6-4502-B03F-B56F7699A8D9}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|ARM64 = Debug|ARM64 Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 - DebugDLL|ARM64 = DebugDLL|ARM64 DebugDLL|Win32 = DebugDLL|Win32 DebugDLL|x64 = DebugDLL|x64 - Release|ARM64 = Release|ARM64 Release|Win32 = Release|Win32 Release|x64 = Release|x64 - ReleaseDLL|ARM64 = ReleaseDLL|ARM64 ReleaseDLL|Win32 = ReleaseDLL|Win32 ReleaseDLL|x64 = ReleaseDLL|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A185B162-6CB6-4502-B03F-B56F7699A8D9}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {A185B162-6CB6-4502-B03F-B56F7699A8D9}.Debug|ARM64.Build.0 = Debug|ARM64 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.Debug|Win32.ActiveCfg = Debug|Win32 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.Debug|Win32.Build.0 = Debug|Win32 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.Debug|x64.ActiveCfg = Debug|x64 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.Debug|x64.Build.0 = Debug|x64 - {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DebugDLL|ARM64.ActiveCfg = DebugDLL|ARM64 - {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DebugDLL|ARM64.Build.0 = DebugDLL|ARM64 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DebugDLL|Win32.Build.0 = DebugDLL|Win32 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DebugDLL|x64.ActiveCfg = DebugDLL|x64 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.DebugDLL|x64.Build.0 = DebugDLL|x64 - {A185B162-6CB6-4502-B03F-B56F7699A8D9}.Release|ARM64.ActiveCfg = Release|ARM64 - {A185B162-6CB6-4502-B03F-B56F7699A8D9}.Release|ARM64.Build.0 = Release|ARM64 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.Release|Win32.ActiveCfg = Release|Win32 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.Release|Win32.Build.0 = Release|Win32 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.Release|x64.ActiveCfg = Release|x64 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.Release|x64.Build.0 = Release|x64 - {A185B162-6CB6-4502-B03F-B56F7699A8D9}.ReleaseDLL|ARM64.ActiveCfg = ReleaseDLL|ARM64 - {A185B162-6CB6-4502-B03F-B56F7699A8D9}.ReleaseDLL|ARM64.Build.0 = ReleaseDLL|ARM64 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.ReleaseDLL|Win32.Build.0 = ReleaseDLL|Win32 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.ReleaseDLL|x64.ActiveCfg = ReleaseDLL|x64 @@ -49,7 +37,4 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {5A6485EC-81D2-4E84-80BE-2D82A65D901C} - EndGlobalSection EndGlobal diff --git a/libsodium.vcxproj b/libsodium.vcxproj index d7f2e5b9..d9be17b4 100644 --- a/libsodium.vcxproj +++ b/libsodium.vcxproj @@ -417,9 +417,9 @@ - - - + + + @@ -568,10 +568,11 @@ - - - - + + + + + diff --git a/libsodium.vcxproj.filters b/libsodium.vcxproj.filters index bac5d462..79645076 100644 --- a/libsodium.vcxproj.filters +++ b/libsodium.vcxproj.filters @@ -321,13 +321,13 @@ Source Files - + Source Files - + Source Files - + Source Files @@ -770,16 +770,19 @@ Header Files - + Header Files - + Header Files - + Header Files - + + Header Files + + Header Files diff --git a/regen-msvc/libsodium.vcxproj.tpl b/regen-msvc/libsodium.vcxproj.tpl index 423d5710..d09d933f 100644 --- a/regen-msvc/libsodium.vcxproj.tpl +++ b/regen-msvc/libsodium.vcxproj.tpl @@ -6,7 +6,54 @@ {{platform}} - {{ProjectConfigurations}} + + DebugDLL + Win32 + + + ReleaseDLL + Win32 + + + DebugDLL + x64 + + + ReleaseDLL + x64 + + + DebugLTCG + Win32 + + + ReleaseLTCG + Win32 + + + DebugLTCG + x64 + + + ReleaseLTCG + x64 + + + DebugLIB + Win32 + + + ReleaseLIB + Win32 + + + DebugLIB + x64 + + + ReleaseLIB + x64 + StaticLibrary diff --git a/regen-msvc/regen-msvc.py b/regen-msvc/regen-msvc.py index 953d5a61..8b479d82 100755 --- a/regen-msvc/regen-msvc.py +++ b/regen-msvc/regen-msvc.py @@ -76,20 +76,6 @@ for dir in dirs: fd = fd + " {{{}}}\r\n".format(uid) fd = fd + " \r\n" -def get_project_configurations(vs_version): - projconfig = "" - configs = ["DebugDLL", "ReleaseDLL", "DebugLIB", "ReleaseLIB", "DebugLTCG", "ReleaseLTCG"] - platforms = ["Win32", "x64"] - # add arm64 platform only for v142+ toolchain - if vs_version >= 142: - platforms.append("ARM64") - for config in configs: - for platform in platforms: - projconfig = projconfig + ' \r\n'.format(config, platform) - projconfig = projconfig + " {}\r\n".format(config) - projconfig = projconfig + " {}\r\n".format(platform) - projconfig = projconfig + " \r\n" - return projconfig def apply_template(tplfile, outfile, sbox): tpl = "" @@ -169,14 +155,12 @@ apply_template( ) sbox.update({"platform": "v142"}) -sbox.update({"ProjectConfigurations": get_project_configurations(142)}) apply_template( sd + "/libsodium.vcxproj.tpl", "builds/msvc/vs2019/libsodium/libsodium.vcxproj", sbox, ) -sbox.update({"ProjectConfigurations": get_project_configurations(141)}) sbox.update({"platform": "v141"}) apply_template( sd + "/libsodium.vcxproj.tpl", @@ -184,7 +168,6 @@ apply_template( sbox, ) -sbox.update({"ProjectConfigurations": get_project_configurations(140)}) sbox.update({"platform": "v140"}) apply_template( sd + "/libsodium.vcxproj.tpl", @@ -192,7 +175,6 @@ apply_template( sbox, ) -sbox.update({"ProjectConfigurations": get_project_configurations(120)}) sbox.update({"platform": "v120"}) apply_template( sd + "/libsodium.vcxproj.tpl", @@ -200,7 +182,6 @@ apply_template( sbox, ) -sbox.update({"ProjectConfigurations": get_project_configurations(110)}) sbox.update({"platform": "v110"}) apply_template( sd + "/libsodium.vcxproj.tpl", @@ -208,7 +189,6 @@ apply_template( sbox, ) -sbox.update({"ProjectConfigurations": get_project_configurations(100)}) sbox.update({"platform": "v100"}) apply_template( sd + "/libsodium.vcxproj.tpl", diff --git a/test/default/wintest.bat b/test/default/wintest.bat index 4a22edad..e50fb494 100755 --- a/test/default/wintest.bat +++ b/test/default/wintest.bat @@ -1,7 +1,7 @@ @ECHO OFF if "%1" == "" ( - echo "Usage: wintest.bat [ ]" + echo "Usage: wintest.bat