From 17c1b5cd0b35db7c7fb3304b3f4941d5fe1b4cb0 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Thu, 31 Mar 2022 19:58:32 +0200 Subject: [PATCH] Regen MSVC files --- .../msvc/vs2010/libsodium/libsodium.vcxproj | 48 ++--- .../msvc/vs2012/libsodium/libsodium.vcxproj | 48 ++--- .../msvc/vs2013/libsodium/libsodium.vcxproj | 48 ++--- .../msvc/vs2015/libsodium/libsodium.vcxproj | 48 ++--- .../msvc/vs2017/libsodium/libsodium.vcxproj | 48 ++--- .../msvc/vs2022/libsodium/libsodium.vcxproj | 49 +---- libsodium.vcxproj | 173 +----------------- libsodium.vcxproj.filters | 10 +- 8 files changed, 131 insertions(+), 341 deletions(-) diff --git a/builds/msvc/vs2010/libsodium/libsodium.vcxproj b/builds/msvc/vs2010/libsodium/libsodium.vcxproj index eb651a8e..ab8bcb0a 100644 --- a/builds/msvc/vs2010/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2010/libsodium/libsodium.vcxproj @@ -10,50 +10,50 @@ DebugDLL Win32 - - ReleaseDLL - Win32 - DebugDLL x64 + + ReleaseDLL + Win32 + ReleaseDLL x64 - - DebugLTCG - Win32 - - - ReleaseLTCG - Win32 - - - DebugLTCG - x64 - - - ReleaseLTCG - x64 - DebugLIB Win32 - - ReleaseLIB - Win32 - DebugLIB x64 + + ReleaseLIB + Win32 + ReleaseLIB x64 + + DebugLTCG + Win32 + + + DebugLTCG + x64 + + + ReleaseLTCG + Win32 + + + ReleaseLTCG + x64 + StaticLibrary diff --git a/builds/msvc/vs2012/libsodium/libsodium.vcxproj b/builds/msvc/vs2012/libsodium/libsodium.vcxproj index f4f4d659..f0210427 100644 --- a/builds/msvc/vs2012/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2012/libsodium/libsodium.vcxproj @@ -10,50 +10,50 @@ DebugDLL Win32 - - ReleaseDLL - Win32 - DebugDLL x64 + + ReleaseDLL + Win32 + ReleaseDLL x64 - - DebugLTCG - Win32 - - - ReleaseLTCG - Win32 - - - DebugLTCG - x64 - - - ReleaseLTCG - x64 - DebugLIB Win32 - - ReleaseLIB - Win32 - DebugLIB x64 + + ReleaseLIB + Win32 + ReleaseLIB x64 + + DebugLTCG + Win32 + + + DebugLTCG + x64 + + + ReleaseLTCG + Win32 + + + ReleaseLTCG + x64 + StaticLibrary diff --git a/builds/msvc/vs2013/libsodium/libsodium.vcxproj b/builds/msvc/vs2013/libsodium/libsodium.vcxproj index 06fb462d..d4d521a7 100644 --- a/builds/msvc/vs2013/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2013/libsodium/libsodium.vcxproj @@ -10,50 +10,50 @@ DebugDLL Win32 - - ReleaseDLL - Win32 - DebugDLL x64 + + ReleaseDLL + Win32 + ReleaseDLL x64 - - DebugLTCG - Win32 - - - ReleaseLTCG - Win32 - - - DebugLTCG - x64 - - - ReleaseLTCG - x64 - DebugLIB Win32 - - ReleaseLIB - Win32 - DebugLIB x64 + + ReleaseLIB + Win32 + ReleaseLIB x64 + + DebugLTCG + Win32 + + + DebugLTCG + x64 + + + ReleaseLTCG + Win32 + + + ReleaseLTCG + x64 + StaticLibrary diff --git a/builds/msvc/vs2015/libsodium/libsodium.vcxproj b/builds/msvc/vs2015/libsodium/libsodium.vcxproj index ffe754e7..ab07ff28 100644 --- a/builds/msvc/vs2015/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2015/libsodium/libsodium.vcxproj @@ -10,50 +10,50 @@ DebugDLL Win32 - - ReleaseDLL - Win32 - DebugDLL x64 + + ReleaseDLL + Win32 + ReleaseDLL x64 - - DebugLTCG - Win32 - - - ReleaseLTCG - Win32 - - - DebugLTCG - x64 - - - ReleaseLTCG - x64 - DebugLIB Win32 - - ReleaseLIB - Win32 - DebugLIB x64 + + ReleaseLIB + Win32 + ReleaseLIB x64 + + DebugLTCG + Win32 + + + DebugLTCG + x64 + + + ReleaseLTCG + Win32 + + + ReleaseLTCG + x64 + StaticLibrary diff --git a/builds/msvc/vs2017/libsodium/libsodium.vcxproj b/builds/msvc/vs2017/libsodium/libsodium.vcxproj index c6df3a98..0de45ab3 100644 --- a/builds/msvc/vs2017/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2017/libsodium/libsodium.vcxproj @@ -10,50 +10,50 @@ DebugDLL Win32 - - ReleaseDLL - Win32 - DebugDLL x64 + + ReleaseDLL + Win32 + ReleaseDLL x64 - - DebugLTCG - Win32 - - - ReleaseLTCG - Win32 - - - DebugLTCG - x64 - - - ReleaseLTCG - x64 - DebugLIB Win32 - - ReleaseLIB - Win32 - DebugLIB x64 + + ReleaseLIB + Win32 + ReleaseLIB x64 + + DebugLTCG + Win32 + + + DebugLTCG + x64 + + + ReleaseLTCG + Win32 + + + ReleaseLTCG + x64 + StaticLibrary diff --git a/builds/msvc/vs2022/libsodium/libsodium.vcxproj b/builds/msvc/vs2022/libsodium/libsodium.vcxproj index 71b7fc7b..2aedf72c 100644 --- a/builds/msvc/vs2022/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2022/libsodium/libsodium.vcxproj @@ -6,54 +6,7 @@ v143 - - DebugDLL - Win32 - - - ReleaseDLL - Win32 - - - DebugDLL - x64 - - - ReleaseDLL - x64 - - - DebugLTCG - Win32 - - - ReleaseLTCG - Win32 - - - DebugLTCG - x64 - - - ReleaseLTCG - x64 - - - DebugLIB - Win32 - - - ReleaseLIB - Win32 - - - DebugLIB - x64 - - - ReleaseLIB - x64 - + {{ProjectConfigurations}} StaticLibrary diff --git a/libsodium.vcxproj b/libsodium.vcxproj index fb20266c..500f518a 100644 --- a/libsodium.vcxproj +++ b/libsodium.vcxproj @@ -1,10 +1,6 @@  - - DebugDLL - ARM64 - DebugDLL Win32 @@ -13,10 +9,6 @@ DebugDLL x64 - - Debug - ARM64 - Debug Win32 @@ -25,10 +17,6 @@ Debug x64 - - ReleaseDLL - ARM64 - ReleaseDLL Win32 @@ -37,10 +25,6 @@ ReleaseDLL x64 - - Release - ARM64 - Release Win32 @@ -54,7 +38,6 @@ {A185B162-6CB6-4502-B03F-B56F7699A8D9} Win32Proj libsodium - 10.0 @@ -62,84 +45,56 @@ true MultiByte false - v142 - - - StaticLibrary - true - MultiByte - false - v142 + v140 DynamicLibrary true MultiByte false - v142 - - - DynamicLibrary - true - MultiByte - false - v142 + v140 StaticLibrary true MultiByte false - v142 + v140 DynamicLibrary true MultiByte false - v142 + v140 StaticLibrary false true MultiByte - v142 - - - StaticLibrary - false - true - MultiByte - v142 + v140 DynamicLibrary false true MultiByte - v142 - - - DynamicLibrary - false - true - MultiByte - v142 + v140 StaticLibrary false true MultiByte - v142 + v140 DynamicLibrary false true MultiByte - v142 + v140 @@ -148,18 +103,10 @@ - - - - - - - - @@ -172,18 +119,10 @@ - - - - - - - - @@ -198,21 +137,11 @@ $(SolutionDir)Build\$(Configuration)\$(Platform)\ $(SolutionDir)Build\$(Configuration)\$(Platform)\Intermediate\ - - true - $(SolutionDir)Build\$(Configuration)\$(Platform)\ - $(SolutionDir)Build\$(Configuration)\$(Platform)\Intermediate\ - true $(SolutionDir)Build\$(Configuration)\$(Platform)\ $(SolutionDir)Build\$(Configuration)\$(Platform)\Intermediate\ - - true - $(SolutionDir)Build\$(Configuration)\$(Platform)\ - $(SolutionDir)Build\$(Configuration)\$(Platform)\Intermediate\ - true $(SolutionDir)Build\$(Configuration)\$(Platform)\ @@ -228,21 +157,11 @@ $(SolutionDir)Build\$(Configuration)\$(Platform)\ $(SolutionDir)Build\$(Configuration)\$(Platform)\Intermediate\ - - false - $(SolutionDir)Build\$(Configuration)\$(Platform)\ - $(SolutionDir)Build\$(Configuration)\$(Platform)\Intermediate\ - false $(SolutionDir)Build\$(Configuration)\$(Platform)\ $(SolutionDir)Build\$(Configuration)\$(Platform)\Intermediate\ - - false - $(SolutionDir)Build\$(Configuration)\$(Platform)\ - $(SolutionDir)Build\$(Configuration)\$(Platform)\Intermediate\ - false $(SolutionDir)Build\$(Configuration)\$(Platform)\ @@ -269,22 +188,6 @@ true - - - - - Level3 - Disabled - SODIUM_STATIC;SODIUM_EXPORT=;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - 4244;%(DisableSpecificWarnings) - MultiThreadedDebug - $(SolutionDir);$(SolutionDir)src\libsodium\include\sodium;$(SolutionDir)src\libsodium\include\sodium;$(SolutionDir)src\libsodium\include;%(AdditionalIncludeDirectories) - - - Console - true - - @@ -301,22 +204,6 @@ true - - - - - Level3 - Disabled - SODIUM_EXPORT=__declspec(dllexport);SODIUM_DLL_EXPORT;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - 4244;%(DisableSpecificWarnings) - MultiThreadedDebugDLL - $(SolutionDir);$(SolutionDir)src\libsodium\include\sodium;$(SolutionDir)src\libsodium\include\sodium;$(SolutionDir)src\libsodium\include;%(AdditionalIncludeDirectories) - - - Console - true - - @@ -368,27 +255,6 @@ true - - - Level3 - - - Full - true - true - SODIUM_STATIC;SODIUM_EXPORT=;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - 4244;%(DisableSpecificWarnings) - MultiThreaded - Speed - $(SolutionDir);$(SolutionDir)src\libsodium\include\sodium;$(SolutionDir)src\libsodium\include\sodium;$(SolutionDir)src\libsodium\include;%(AdditionalIncludeDirectories) - - - Console - true - true - true - - Level3 @@ -410,27 +276,6 @@ true - - - Level3 - - - Full - true - true - SODIUM_EXPORT=__declspec(dllexport);SODIUM_DLL_EXPORT;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - 4244;%(DisableSpecificWarnings) - MultiThreadedDLL - Speed - $(SolutionDir);$(SolutionDir)src\libsodium\include\sodium;$(SolutionDir)src\libsodium\include\sodium;$(SolutionDir)src\libsodium\include;%(AdditionalIncludeDirectories) - - - Console - true - true - true - - Level3 @@ -730,4 +575,4 @@ - \ No newline at end of file + diff --git a/libsodium.vcxproj.filters b/libsodium.vcxproj.filters index e7cc27ad..42bef65f 100644 --- a/libsodium.vcxproj.filters +++ b/libsodium.vcxproj.filters @@ -764,13 +764,5 @@ Header Files - - Header Files - - - - Resource Files - - - \ No newline at end of file +