From 267c406b68d9136973721e3ed1ef7bd5fe628d6a Mon Sep 17 00:00:00 2001 From: Gaspard Petit Date: Fri, 7 Jun 2024 17:10:50 -0400 Subject: [PATCH] Updated projects to Visual Studio 2022 --- .gitignore | 4 +- .gitmodules | 3 + build/msvc/base64.sln | 6 +- build/msvc/base64.vcxproj | 11 +-- build/msvc/gtest.vcxproj | 8 +- libs/TurboBase64.vcxproj | 188 ++++++++++++++++++++++++++++++++++++++ libs/googletest | 1 + 7 files changed, 206 insertions(+), 15 deletions(-) create mode 100644 libs/TurboBase64.vcxproj create mode 160000 libs/googletest diff --git a/.gitignore b/.gitignore index 789c278..d0a5114 100644 --- a/.gitignore +++ b/.gitignore @@ -44,4 +44,6 @@ CTestTestfile.cmake *.vcxproj.user # Other -.#* \ No newline at end of file +.#* +build/msvc/msvc.build/** +build/msvc/result/** diff --git a/.gitmodules b/.gitmodules index caf91c6..0333715 100644 --- a/.gitmodules +++ b/.gitmodules @@ -62,3 +62,6 @@ [submodule "libs/base64-aklomp"] path = libs/base64-aklomp url = https://github.com/aklomp/base64.git +[submodule "libs/googletest"] + path = libs/googletest + url = https://github.com/google/googletest.git diff --git a/build/msvc/base64.sln b/build/msvc/base64.sln index 41106ae..00e78b3 100644 --- a/build/msvc/base64.sln +++ b/build/msvc/base64.sln @@ -1,13 +1,13 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30804.86 +# Visual Studio Version 17 +VisualStudioVersion = 17.10.34928.147 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest", "gtest.vcxproj", "{B6A473FB-1AC2-4E15-B975-43FDC48B4A57}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base64", "base64.vcxproj", "{8E386649-B4B2-4C81-9F8D-E59AE5CA8A36}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TurboBase64", "..\..\libs\Turbo-Base64\vs\vs2017\TurboBase64.vcxproj", "{A162F37F-183F-4250-88AB-9B9FBDE30B04}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TurboBase64", "..\..\libs\TurboBase64.vcxproj", "{A162F37F-183F-4250-88AB-9B9FBDE30B04}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/build/msvc/base64.vcxproj b/build/msvc/base64.vcxproj index 9e17e3b..86b1554 100644 --- a/build/msvc/base64.vcxproj +++ b/build/msvc/base64.vcxproj @@ -28,26 +28,26 @@ Application true - v142 + v143 Unicode Application false - v142 + v143 true Unicode Application true - v142 + v143 Unicode Application false - v142 + v143 true Unicode @@ -219,9 +219,6 @@ - - {a162f37f-183f-4250-88ab-9b9fbde30b04} - {b6a473fb-1ac2-4e15-b975-43fdc48b4a57} diff --git a/build/msvc/gtest.vcxproj b/build/msvc/gtest.vcxproj index 6b0cb42..bc70fb1 100644 --- a/build/msvc/gtest.vcxproj +++ b/build/msvc/gtest.vcxproj @@ -82,26 +82,26 @@ StaticLibrary true - v142 + v143 Unicode StaticLibrary false - v142 + v143 true Unicode StaticLibrary true - v142 + v143 Unicode StaticLibrary false - v142 + v143 true Unicode diff --git a/libs/TurboBase64.vcxproj b/libs/TurboBase64.vcxproj new file mode 100644 index 0000000..2ea7e43 --- /dev/null +++ b/libs/TurboBase64.vcxproj @@ -0,0 +1,188 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + + __SSE__;__SSE2__;__SSE3__;__SSSE3__;__SSE4_1__;__SSE4_2__;__AVX__;__AVX2__;_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + + + __SSE__;__SSE2__;__SSE3__;__SSSE3__;_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + __SSE__;__SSE2__;__SSE3__;__SSSE3__;_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + __SSE__;__SSE2__;__SSE3__;__SSSE3__;__SSE4_1__;__SSE4_2__;__AVX__;_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + __SSE__;__SSE2__;__SSE3__;__SSSE3__;__SSE4_1__;__SSE4_2__;__AVX__;_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + + + + 15.0 + {A162F37F-183F-4250-88AB-9B9FBDE30B04} + Win32Proj + TurboBase64 + 10.0 + TurboBase64 + + + + StaticLibrary + true + v143 + + + StaticLibrary + true + v143 + + + StaticLibrary + false + v143 + + + StaticLibrary + false + v143 + + + + + + + + + + + + + + + + + + + + + true + $(SolutionDir)msvc.build\.obj\$(Platform)-$(Configuration)-$(ProjectName)\ + $(SolutionDir)msvc.build\$(Platform)-$(Configuration)\ + + + true + $(SolutionDir)msvc.build\.obj\$(Platform)-$(Configuration)-$(ProjectName)\ + $(SolutionDir)msvc.build\$(Platform)-$(Configuration)\ + + + false + $(SolutionDir)msvc.build\.obj\$(Platform)-$(Configuration)-$(ProjectName)\ + $(SolutionDir)msvc.build\$(Platform)-$(Configuration)\ + + + false + $(SolutionDir)msvc.build\.obj\$(Platform)-$(Configuration)-$(ProjectName)\ + $(SolutionDir)msvc.build\$(Platform)-$(Configuration)\ + + + + MaxSpeed + true + _CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + AdvancedVectorExtensions2 + MultiThreadedDebug + true + /w24003 /w24005 /w24028 /w24047 /w24090 /w24133 /w24146 /w24333 /w24789 %(AdditionalOptions) + Turbo-Base64 + Speed + false + Fast + Default + + + Console + true + + + + + Disabled + true + __SSE__;__SSE2__;__SSE3__;__SSSE3__;__SSE4_1__;__SSE4_2__;USE_SSE;USE_AVX2;_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + AdvancedVectorExtensions2 + MultiThreadedDebug + true + /w24003 /w24005 /w24028 /w24047 /w24090 /w24133 /w24146 /w24333 /w24789 %(AdditionalOptions) + Turbo-Base64 + + + Console + true + + + + + MaxSpeed + true + false + true + __SSE__;__SSE2__;__SSE3__;__SSSE3__;__SSE4_1__;__SSE4_2__;USE_SSE;USE_AVX2;_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + NotSet + Speed + MultiThreaded + true + /w24003 /w24005 /w24028 /w24047 /w24090 /w24133 /w24146 /w24333 /w24789 %(AdditionalOptions) + Turbo-Base64 + + + Console + true + true + true + + + + + MaxSpeed + true + true + true + __SSE__;__SSE2__;__SSE3__;__SSSE3__;__SSE4_1__;__SSE4_2__;USE_SSE;USE_AVX2;_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + AdvancedVectorExtensions2 + Speed + MultiThreaded + true + /w24003 /w24005 /w24028 /w24047 /w24090 /w24133 /w24146 /w24333 /w24789 %(AdditionalOptions) + Turbo-Base64 + + + Console + true + true + true + + + + + + \ No newline at end of file diff --git a/libs/googletest b/libs/googletest new file mode 160000 index 0000000..a7f443b --- /dev/null +++ b/libs/googletest @@ -0,0 +1 @@ +Subproject commit a7f443b80b105f940225332ed3c31f2790092f47