From 801784db69e20ae98baa63fe8abb3a00a0efcfa3 Mon Sep 17 00:00:00 2001 From: Adriano dos Santos Fernandes Date: Thu, 28 Oct 2021 13:48:23 -0300 Subject: [PATCH] Add support for VS 2022 build. --- builds/win32/msvc15/alice.vcxproj | 5 +++++ builds/win32/msvc15/btyacc.vcxproj | 5 +++++ builds/win32/msvc15/build_msg.vcxproj | 5 +++++ builds/win32/msvc15/burp.vcxproj | 5 +++++ builds/win32/msvc15/chacha.vcxproj | 5 +++++ builds/win32/msvc15/common.vcxproj | 4 ++++ builds/win32/msvc15/empbuild.vcxproj | 5 +++++ builds/win32/msvc15/engine.vcxproj | 5 +++++ builds/win32/msvc15/fb2control.vcxproj | 5 +++++ builds/win32/msvc15/fb_lock_print.vcxproj | 5 +++++ builds/win32/msvc15/fbguard.vcxproj | 5 +++++ builds/win32/msvc15/fbrmclib.vcxproj | 3 +++ builds/win32/msvc15/fbserver.vcxproj | 5 +++++ builds/win32/msvc15/fbsvcmgr.vcxproj | 5 +++++ builds/win32/msvc15/fbtrace.vcxproj | 5 +++++ builds/win32/msvc15/fbtracemgr.vcxproj | 5 +++++ builds/win32/msvc15/gbak.vcxproj | 5 +++++ builds/win32/msvc15/gfix.vcxproj | 5 +++++ builds/win32/msvc15/gpre.vcxproj | 5 +++++ builds/win32/msvc15/gpre_boot.vcxproj | 5 +++++ builds/win32/msvc15/gpre_common.vcxproj | 5 +++++ builds/win32/msvc15/gsec.vcxproj | 5 +++++ builds/win32/msvc15/gsplit.vcxproj | 5 +++++ builds/win32/msvc15/gstat.vcxproj | 5 +++++ builds/win32/msvc15/ib_util.vcxproj | 5 +++++ builds/win32/msvc15/instclient.vcxproj | 5 +++++ builds/win32/msvc15/instreg.vcxproj | 5 +++++ builds/win32/msvc15/instsvc.vcxproj | 5 +++++ builds/win32/msvc15/intl.vcxproj | 5 +++++ builds/win32/msvc15/intlbuild.vcxproj | 5 +++++ builds/win32/msvc15/isql.vcxproj | 5 +++++ builds/win32/msvc15/legacy_auth.vcxproj | 5 +++++ builds/win32/msvc15/legacy_usermanager.vcxproj | 5 +++++ builds/win32/msvc15/nbackup.vcxproj | 5 +++++ builds/win32/msvc15/remote.vcxproj | 5 +++++ builds/win32/msvc15/srp.vcxproj | 5 +++++ builds/win32/msvc15/udf_compat.vcxproj | 5 +++++ builds/win32/msvc15/udr_engine.vcxproj | 5 +++++ builds/win32/msvc15/udrcpp_example.vcxproj | 5 +++++ builds/win32/msvc15/yvalve.vcxproj | 5 +++++ builds/win32/run_all.bat | 5 +++++ builds/win32/setenvvar.bat | 5 +++++ examples/dbcrypt/msvc/DbCryptApp_MSVC15.vcxproj | 5 +++++ examples/dbcrypt/msvc/DbCrypt_MSVC15.vcxproj | 5 +++++ examples/dbcrypt/msvc/KeyHolder_MSVC15.vcxproj | 5 +++++ examples/extauth/msvc/ExtAuth_MSVC15.vcxproj | 5 +++++ examples/extauth/msvc/KeyGen_MSVC15.vcxproj | 5 +++++ extern/cloop/src/cloop/cloop.vcxproj | 5 +++++ extern/cloop/src/tests/test1/test1-c-dll.vcxproj | 5 +++++ extern/cloop/src/tests/test1/test1-c-exe.vcxproj | 5 +++++ extern/cloop/src/tests/test1/test1-cpp-dll.vcxproj | 5 +++++ extern/cloop/src/tests/test1/test1-cpp-exe.vcxproj | 5 +++++ extern/decNumber/msvc/decNumber_MSVC15.vcxproj | 5 +++++ extern/libtomcrypt/libtomcrypt_MSVC15.vcxproj | 5 +++++ extern/libtommath/libtommath_MSVC15.vcxproj | 5 +++++ 55 files changed, 272 insertions(+) diff --git a/builds/win32/msvc15/alice.vcxproj b/builds/win32/msvc15/alice.vcxproj index 505731a721..2599e8b71e 100644 --- a/builds/win32/msvc15/alice.vcxproj +++ b/builds/win32/msvc15/alice.vcxproj @@ -22,6 +22,7 @@ {0D616380-1A5A-4230-A80B-021360E4E669} 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -30,6 +31,7 @@ MultiByte v141_xp v142 + v143 StaticLibrary @@ -37,6 +39,7 @@ MultiByte v141_xp v142 + v143 StaticLibrary @@ -44,6 +47,7 @@ MultiByte v141 v142 + v143 StaticLibrary @@ -51,6 +55,7 @@ MultiByte v141 v142 + v143 diff --git a/builds/win32/msvc15/btyacc.vcxproj b/builds/win32/msvc15/btyacc.vcxproj index 5ce0088878..125a0c84d5 100644 --- a/builds/win32/msvc15/btyacc.vcxproj +++ b/builds/win32/msvc15/btyacc.vcxproj @@ -24,6 +24,7 @@ ManagedCProj 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -32,6 +33,7 @@ false v141_xp v142 + v143 Application @@ -39,6 +41,7 @@ false v141_xp v142 + v143 Application @@ -46,6 +49,7 @@ false v141 v142 + v143 Application @@ -53,6 +57,7 @@ false v141 v142 + v143 diff --git a/builds/win32/msvc15/build_msg.vcxproj b/builds/win32/msvc15/build_msg.vcxproj index a210936a12..444855c353 100644 --- a/builds/win32/msvc15/build_msg.vcxproj +++ b/builds/win32/msvc15/build_msg.vcxproj @@ -23,6 +23,7 @@ build_msg 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -31,6 +32,7 @@ MultiByte v141_xp v142 + v143 Application @@ -38,6 +40,7 @@ MultiByte v141_xp v142 + v143 Application @@ -45,6 +48,7 @@ MultiByte v141 v142 + v143 Application @@ -52,6 +56,7 @@ MultiByte v141 v142 + v143 diff --git a/builds/win32/msvc15/burp.vcxproj b/builds/win32/msvc15/burp.vcxproj index ffc6e835dd..7492eb7fb1 100644 --- a/builds/win32/msvc15/burp.vcxproj +++ b/builds/win32/msvc15/burp.vcxproj @@ -22,6 +22,7 @@ {D1507562-A363-4685-96AF-B036F5E5E47F} 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -30,6 +31,7 @@ MultiByte v141_xp v142 + v143 StaticLibrary @@ -37,6 +39,7 @@ MultiByte v141_xp v142 + v143 StaticLibrary @@ -44,6 +47,7 @@ MultiByte v141 v142 + v143 StaticLibrary @@ -51,6 +55,7 @@ MultiByte v141 v142 + v143 diff --git a/builds/win32/msvc15/chacha.vcxproj b/builds/win32/msvc15/chacha.vcxproj index 66ef372e15..0d6df45461 100644 --- a/builds/win32/msvc15/chacha.vcxproj +++ b/builds/win32/msvc15/chacha.vcxproj @@ -23,6 +23,7 @@ chacha 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -30,24 +31,28 @@ MultiByte v141_xp v142 + v143 DynamicLibrary MultiByte v141_xp v142 + v143 DynamicLibrary MultiByte v141 v142 + v143 DynamicLibrary MultiByte v141 v142 + v143 diff --git a/builds/win32/msvc15/common.vcxproj b/builds/win32/msvc15/common.vcxproj index dfdfab5899..90a062e04d 100644 --- a/builds/win32/msvc15/common.vcxproj +++ b/builds/win32/msvc15/common.vcxproj @@ -233,6 +233,7 @@ MultiByte v141_xp v142 + v143 StaticLibrary @@ -240,6 +241,7 @@ MultiByte v141_xp v142 + v143 StaticLibrary @@ -247,6 +249,7 @@ MultiByte v141 v142 + v143 StaticLibrary @@ -254,6 +257,7 @@ MultiByte v141 v142 + v143 diff --git a/builds/win32/msvc15/empbuild.vcxproj b/builds/win32/msvc15/empbuild.vcxproj index de2e3b1602..a312b2b9be 100644 --- a/builds/win32/msvc15/empbuild.vcxproj +++ b/builds/win32/msvc15/empbuild.vcxproj @@ -23,6 +23,7 @@ empbuild 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -31,6 +32,7 @@ MultiByte v141_xp v142 + v143 Application @@ -38,6 +40,7 @@ MultiByte v141_xp v142 + v143 Application @@ -45,6 +48,7 @@ MultiByte v141 v142 + v143 Application @@ -52,6 +56,7 @@ MultiByte v141 v142 + v143 diff --git a/builds/win32/msvc15/engine.vcxproj b/builds/win32/msvc15/engine.vcxproj index ed3d6f13e3..b9a35b3dfb 100644 --- a/builds/win32/msvc15/engine.vcxproj +++ b/builds/win32/msvc15/engine.vcxproj @@ -415,6 +415,7 @@ {F8798A49-9D20-451E-A7BD-FEB5237103B5} 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -423,6 +424,7 @@ MultiByte v141_xp v142 + v143 DynamicLibrary @@ -430,6 +432,7 @@ MultiByte v141_xp v142 + v143 DynamicLibrary @@ -437,6 +440,7 @@ MultiByte v141 v142 + v143 DynamicLibrary @@ -444,6 +448,7 @@ MultiByte v141 v142 + v143 diff --git a/builds/win32/msvc15/fb2control.vcxproj b/builds/win32/msvc15/fb2control.vcxproj index 5a150d1087..657659d4be 100644 --- a/builds/win32/msvc15/fb2control.vcxproj +++ b/builds/win32/msvc15/fb2control.vcxproj @@ -22,6 +22,7 @@ {1AE02D41-7E24-43CC-9BCB-E4CEB6037D16} 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 MFCProj @@ -31,6 +32,7 @@ MultiByte v141_xp v142 + v143 DynamicLibrary @@ -38,6 +40,7 @@ MultiByte v141_xp v142 + v143 DynamicLibrary @@ -45,6 +48,7 @@ MultiByte v141 v142 + v143 DynamicLibrary @@ -52,6 +56,7 @@ MultiByte v141 v142 + v143 diff --git a/builds/win32/msvc15/fb_lock_print.vcxproj b/builds/win32/msvc15/fb_lock_print.vcxproj index 3407abe1e5..e37ef2a0bf 100644 --- a/builds/win32/msvc15/fb_lock_print.vcxproj +++ b/builds/win32/msvc15/fb_lock_print.vcxproj @@ -22,6 +22,7 @@ {E8397148-0E9C-449B-9F45-7FB377A08242} 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -30,6 +31,7 @@ MultiByte v141_xp v142 + v143 Application @@ -37,6 +39,7 @@ MultiByte v141_xp v142 + v143 Application @@ -44,6 +47,7 @@ MultiByte v141 v142 + v143 Application @@ -51,6 +55,7 @@ MultiByte v141 v142 + v143 diff --git a/builds/win32/msvc15/fbguard.vcxproj b/builds/win32/msvc15/fbguard.vcxproj index 37fc9b1fb0..abe5ecf215 100644 --- a/builds/win32/msvc15/fbguard.vcxproj +++ b/builds/win32/msvc15/fbguard.vcxproj @@ -22,6 +22,7 @@ {BBD83ED3-8A48-4FE8-B4B7-CB27730986B2} 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -30,6 +31,7 @@ MultiByte v141_xp v142 + v143 Application @@ -37,6 +39,7 @@ MultiByte v141_xp v142 + v143 Application @@ -44,6 +47,7 @@ MultiByte v141 v142 + v143 Application @@ -51,6 +55,7 @@ MultiByte v141 v142 + v143 diff --git a/builds/win32/msvc15/fbrmclib.vcxproj b/builds/win32/msvc15/fbrmclib.vcxproj index 83fabe1af8..b203bbd2d0 100644 --- a/builds/win32/msvc15/fbrmclib.vcxproj +++ b/builds/win32/msvc15/fbrmclib.vcxproj @@ -14,6 +14,7 @@ {FAF9AD25-8238-49E9-9AC9-8C56E190440A} 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -22,6 +23,7 @@ MultiByte v141_xp v142 + v143 DynamicLibrary @@ -29,6 +31,7 @@ MultiByte v141_xp v142 + v143 diff --git a/builds/win32/msvc15/fbserver.vcxproj b/builds/win32/msvc15/fbserver.vcxproj index a73a079fb6..d37acec441 100644 --- a/builds/win32/msvc15/fbserver.vcxproj +++ b/builds/win32/msvc15/fbserver.vcxproj @@ -22,6 +22,7 @@ {23EC8DAA-6718-4EF3-979F-89F611C7D504} 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -30,6 +31,7 @@ MultiByte v141_xp v142 + v143 Application @@ -37,6 +39,7 @@ MultiByte v141_xp v142 + v143 Application @@ -44,6 +47,7 @@ MultiByte v141 v142 + v143 Application @@ -51,6 +55,7 @@ MultiByte v141 v142 + v143 diff --git a/builds/win32/msvc15/fbsvcmgr.vcxproj b/builds/win32/msvc15/fbsvcmgr.vcxproj index 2ae240da41..0e2aeed279 100644 --- a/builds/win32/msvc15/fbsvcmgr.vcxproj +++ b/builds/win32/msvc15/fbsvcmgr.vcxproj @@ -22,6 +22,7 @@ {EFB07DBC-36E3-4C54-B941-3CDAFAACF47B} 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -30,6 +31,7 @@ MultiByte v141_xp v142 + v143 Application @@ -37,6 +39,7 @@ MultiByte v141_xp v142 + v143 Application @@ -44,6 +47,7 @@ MultiByte v141 v142 + v143 Application @@ -51,6 +55,7 @@ MultiByte v141 v142 + v143 diff --git a/builds/win32/msvc15/fbtrace.vcxproj b/builds/win32/msvc15/fbtrace.vcxproj index 549a04756a..cb5d80ab33 100644 --- a/builds/win32/msvc15/fbtrace.vcxproj +++ b/builds/win32/msvc15/fbtrace.vcxproj @@ -22,6 +22,7 @@ {53F75437-15B8-4A5C-86BF-E238CC68FCBC} 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -29,24 +30,28 @@ MultiByte v141_xp v142 + v143 DynamicLibrary MultiByte v141_xp v142 + v143 DynamicLibrary MultiByte v141 v142 + v143 DynamicLibrary MultiByte v141 v142 + v143 diff --git a/builds/win32/msvc15/fbtracemgr.vcxproj b/builds/win32/msvc15/fbtracemgr.vcxproj index 66fb330877..4b60eb6905 100644 --- a/builds/win32/msvc15/fbtracemgr.vcxproj +++ b/builds/win32/msvc15/fbtracemgr.vcxproj @@ -24,6 +24,7 @@ Win32Proj 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -32,6 +33,7 @@ MultiByte v141_xp v142 + v143 Application @@ -39,6 +41,7 @@ MultiByte v141_xp v142 + v143 Application @@ -46,6 +49,7 @@ MultiByte v141 v142 + v143 Application @@ -53,6 +57,7 @@ MultiByte v141 v142 + v143 diff --git a/builds/win32/msvc15/gbak.vcxproj b/builds/win32/msvc15/gbak.vcxproj index 156823e04a..a5d702efd2 100644 --- a/builds/win32/msvc15/gbak.vcxproj +++ b/builds/win32/msvc15/gbak.vcxproj @@ -22,6 +22,7 @@ {B732F5D2-B5D9-417F-B156-D790F466CB8E} 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -30,6 +31,7 @@ MultiByte v141_xp v142 + v143 Application @@ -37,6 +39,7 @@ MultiByte v141_xp v142 + v143 Application @@ -44,6 +47,7 @@ MultiByte v141 v142 + v143 Application @@ -51,6 +55,7 @@ MultiByte v141 v142 + v143 diff --git a/builds/win32/msvc15/gfix.vcxproj b/builds/win32/msvc15/gfix.vcxproj index 126e3cb92a..4c8a6134cb 100644 --- a/builds/win32/msvc15/gfix.vcxproj +++ b/builds/win32/msvc15/gfix.vcxproj @@ -23,6 +23,7 @@ gfix 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -31,6 +32,7 @@ MultiByte v141_xp v142 + v143 Application @@ -38,6 +40,7 @@ MultiByte v141_xp v142 + v143 Application @@ -45,6 +48,7 @@ MultiByte v141 v142 + v143 Application @@ -52,6 +56,7 @@ MultiByte v141 v142 + v143 diff --git a/builds/win32/msvc15/gpre.vcxproj b/builds/win32/msvc15/gpre.vcxproj index 2d5f215d99..4c9f4b4035 100644 --- a/builds/win32/msvc15/gpre.vcxproj +++ b/builds/win32/msvc15/gpre.vcxproj @@ -23,6 +23,7 @@ gpre 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -31,6 +32,7 @@ MultiByte v141_xp v142 + v143 Application @@ -38,6 +40,7 @@ MultiByte v141_xp v142 + v143 Application @@ -45,6 +48,7 @@ MultiByte v141 v142 + v143 Application @@ -52,6 +56,7 @@ MultiByte v141 v142 + v143 diff --git a/builds/win32/msvc15/gpre_boot.vcxproj b/builds/win32/msvc15/gpre_boot.vcxproj index bcc18b146c..058f0e70db 100644 --- a/builds/win32/msvc15/gpre_boot.vcxproj +++ b/builds/win32/msvc15/gpre_boot.vcxproj @@ -23,6 +23,7 @@ gpre_boot 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -31,6 +32,7 @@ MultiByte v141_xp v142 + v143 Application @@ -38,6 +40,7 @@ MultiByte v141_xp v142 + v143 Application @@ -45,6 +48,7 @@ MultiByte v141 v142 + v143 Application @@ -52,6 +56,7 @@ MultiByte v141 v142 + v143 diff --git a/builds/win32/msvc15/gpre_common.vcxproj b/builds/win32/msvc15/gpre_common.vcxproj index 6c9d881048..cb0fe6dd6d 100644 --- a/builds/win32/msvc15/gpre_common.vcxproj +++ b/builds/win32/msvc15/gpre_common.vcxproj @@ -23,6 +23,7 @@ gpre 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -31,6 +32,7 @@ MultiByte v141_xp v142 + v143 StaticLibrary @@ -38,6 +40,7 @@ MultiByte v141_xp v142 + v143 StaticLibrary @@ -45,6 +48,7 @@ MultiByte v141 v142 + v143 StaticLibrary @@ -52,6 +56,7 @@ MultiByte v141 v142 + v143 diff --git a/builds/win32/msvc15/gsec.vcxproj b/builds/win32/msvc15/gsec.vcxproj index 5be6cc4bf8..91063172f4 100644 --- a/builds/win32/msvc15/gsec.vcxproj +++ b/builds/win32/msvc15/gsec.vcxproj @@ -22,6 +22,7 @@ {7043CC61-DEC1-4C6B-86B9-0E911D1094C9} 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -30,6 +31,7 @@ MultiByte v141_xp v142 + v143 Application @@ -37,6 +39,7 @@ MultiByte v141_xp v142 + v143 Application @@ -44,6 +47,7 @@ MultiByte v141 v142 + v143 Application @@ -51,6 +55,7 @@ MultiByte v141 v142 + v143 diff --git a/builds/win32/msvc15/gsplit.vcxproj b/builds/win32/msvc15/gsplit.vcxproj index f2f72aeacc..0752cd591d 100644 --- a/builds/win32/msvc15/gsplit.vcxproj +++ b/builds/win32/msvc15/gsplit.vcxproj @@ -23,6 +23,7 @@ gsplit 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -31,6 +32,7 @@ MultiByte v141_xp v142 + v143 Application @@ -38,6 +40,7 @@ MultiByte v141_xp v142 + v143 Application @@ -45,6 +48,7 @@ MultiByte v141 v142 + v143 Application @@ -52,6 +56,7 @@ MultiByte v141 v142 + v143 diff --git a/builds/win32/msvc15/gstat.vcxproj b/builds/win32/msvc15/gstat.vcxproj index 9561bb5420..e710bf45fe 100644 --- a/builds/win32/msvc15/gstat.vcxproj +++ b/builds/win32/msvc15/gstat.vcxproj @@ -22,6 +22,7 @@ {7E862973-37C4-4202-80E7-490ED4DEDA14} 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -30,6 +31,7 @@ MultiByte v141_xp v142 + v143 Application @@ -37,6 +39,7 @@ MultiByte v141_xp v142 + v143 Application @@ -44,6 +47,7 @@ MultiByte v141 v142 + v143 Application @@ -51,6 +55,7 @@ MultiByte v141 v142 + v143 diff --git a/builds/win32/msvc15/ib_util.vcxproj b/builds/win32/msvc15/ib_util.vcxproj index 96dc5695e0..4aaa53b343 100644 --- a/builds/win32/msvc15/ib_util.vcxproj +++ b/builds/win32/msvc15/ib_util.vcxproj @@ -22,6 +22,7 @@ {EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D} 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -30,6 +31,7 @@ MultiByte v141_xp v142 + v143 DynamicLibrary @@ -37,6 +39,7 @@ MultiByte v141_xp v142 + v143 DynamicLibrary @@ -44,6 +47,7 @@ MultiByte v141 v142 + v143 DynamicLibrary @@ -51,6 +55,7 @@ MultiByte v141 v142 + v143 diff --git a/builds/win32/msvc15/instclient.vcxproj b/builds/win32/msvc15/instclient.vcxproj index 181dd5ea17..8d19fc4c8e 100644 --- a/builds/win32/msvc15/instclient.vcxproj +++ b/builds/win32/msvc15/instclient.vcxproj @@ -23,6 +23,7 @@ instclient 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -31,6 +32,7 @@ MultiByte v141_xp v142 + v143 Application @@ -38,6 +40,7 @@ MultiByte v141_xp v142 + v143 Application @@ -45,6 +48,7 @@ MultiByte v141 v142 + v143 Application @@ -52,6 +56,7 @@ MultiByte v141 v142 + v143 diff --git a/builds/win32/msvc15/instreg.vcxproj b/builds/win32/msvc15/instreg.vcxproj index 88f6652274..677e55c92e 100644 --- a/builds/win32/msvc15/instreg.vcxproj +++ b/builds/win32/msvc15/instreg.vcxproj @@ -23,6 +23,7 @@ instreg 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -31,6 +32,7 @@ MultiByte v141_xp v142 + v143 Application @@ -38,6 +40,7 @@ MultiByte v141_xp v142 + v143 Application @@ -45,6 +48,7 @@ MultiByte v141 v142 + v143 Application @@ -52,6 +56,7 @@ MultiByte v141 v142 + v143 diff --git a/builds/win32/msvc15/instsvc.vcxproj b/builds/win32/msvc15/instsvc.vcxproj index bddc2b918f..d028871806 100644 --- a/builds/win32/msvc15/instsvc.vcxproj +++ b/builds/win32/msvc15/instsvc.vcxproj @@ -23,6 +23,7 @@ instsvc 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -31,6 +32,7 @@ MultiByte v141_xp v142 + v143 Application @@ -38,6 +40,7 @@ MultiByte v141_xp v142 + v143 Application @@ -45,6 +48,7 @@ MultiByte v141 v142 + v143 Application @@ -52,6 +56,7 @@ MultiByte v141 v142 + v143 diff --git a/builds/win32/msvc15/intl.vcxproj b/builds/win32/msvc15/intl.vcxproj index 7fb6390e61..419808d754 100644 --- a/builds/win32/msvc15/intl.vcxproj +++ b/builds/win32/msvc15/intl.vcxproj @@ -22,6 +22,7 @@ {DFFA2117-E6A8-4806-BB69-94DAC8F8F42A} 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -30,6 +31,7 @@ MultiByte v141_xp v142 + v143 DynamicLibrary @@ -37,6 +39,7 @@ MultiByte v141_xp v142 + v143 DynamicLibrary @@ -44,6 +47,7 @@ MultiByte v141 v142 + v143 DynamicLibrary @@ -51,6 +55,7 @@ MultiByte v141 v142 + v143 diff --git a/builds/win32/msvc15/intlbuild.vcxproj b/builds/win32/msvc15/intlbuild.vcxproj index 9b9dc33be5..9c8e7ad30d 100644 --- a/builds/win32/msvc15/intlbuild.vcxproj +++ b/builds/win32/msvc15/intlbuild.vcxproj @@ -22,6 +22,7 @@ {9546EF04-1326-464B-A6ED-395C60DD63CC} 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -30,6 +31,7 @@ MultiByte v141_xp v142 + v143 Application @@ -37,6 +39,7 @@ MultiByte v141_xp v142 + v143 Application @@ -44,6 +47,7 @@ MultiByte v141 v142 + v143 Application @@ -51,6 +55,7 @@ MultiByte v141 v142 + v143 diff --git a/builds/win32/msvc15/isql.vcxproj b/builds/win32/msvc15/isql.vcxproj index db9e4559d1..a4130763d2 100644 --- a/builds/win32/msvc15/isql.vcxproj +++ b/builds/win32/msvc15/isql.vcxproj @@ -23,6 +23,7 @@ isql 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -31,6 +32,7 @@ MultiByte v141_xp v142 + v143 Application @@ -38,6 +40,7 @@ MultiByte v141_xp v142 + v143 Application @@ -45,6 +48,7 @@ MultiByte v141 v142 + v143 Application @@ -52,6 +56,7 @@ MultiByte v141 v142 + v143 diff --git a/builds/win32/msvc15/legacy_auth.vcxproj b/builds/win32/msvc15/legacy_auth.vcxproj index 7d5570e55e..6f30dc06bb 100644 --- a/builds/win32/msvc15/legacy_auth.vcxproj +++ b/builds/win32/msvc15/legacy_auth.vcxproj @@ -22,6 +22,7 @@ {062BD3C7-2D01-44F6-8D79-070F688C559F} 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -29,24 +30,28 @@ MultiByte v141_xp v142 + v143 DynamicLibrary MultiByte v141_xp v142 + v143 DynamicLibrary MultiByte v141 v142 + v143 DynamicLibrary MultiByte v141 v142 + v143 diff --git a/builds/win32/msvc15/legacy_usermanager.vcxproj b/builds/win32/msvc15/legacy_usermanager.vcxproj index 04abc5bbe7..fbf86129dc 100644 --- a/builds/win32/msvc15/legacy_usermanager.vcxproj +++ b/builds/win32/msvc15/legacy_usermanager.vcxproj @@ -22,6 +22,7 @@ {D836FBF5-071E-4E04-8D63-C7EB6701B296} 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -29,24 +30,28 @@ MultiByte v141_xp v142 + v143 DynamicLibrary MultiByte v141_xp v142 + v143 DynamicLibrary MultiByte v141 v142 + v143 DynamicLibrary MultiByte v141 v142 + v143 diff --git a/builds/win32/msvc15/nbackup.vcxproj b/builds/win32/msvc15/nbackup.vcxproj index d907715245..2ac4f7dea5 100644 --- a/builds/win32/msvc15/nbackup.vcxproj +++ b/builds/win32/msvc15/nbackup.vcxproj @@ -22,6 +22,7 @@ {01A41DFA-8908-4576-A1F1-C8BC7EAE39A1} 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -30,6 +31,7 @@ MultiByte v141_xp v142 + v143 Application @@ -37,6 +39,7 @@ MultiByte v141_xp v142 + v143 Application @@ -44,6 +47,7 @@ MultiByte v141 v142 + v143 Application @@ -51,6 +55,7 @@ MultiByte v141 v142 + v143 diff --git a/builds/win32/msvc15/remote.vcxproj b/builds/win32/msvc15/remote.vcxproj index 3434497cfd..8fce4d0d3a 100644 --- a/builds/win32/msvc15/remote.vcxproj +++ b/builds/win32/msvc15/remote.vcxproj @@ -22,6 +22,7 @@ {4BCC693D-1745-45ED-8302-E5E2F979549A} 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -30,6 +31,7 @@ MultiByte v141_xp v142 + v143 StaticLibrary @@ -37,6 +39,7 @@ MultiByte v141_xp v142 + v143 StaticLibrary @@ -44,6 +47,7 @@ MultiByte v141 v142 + v143 StaticLibrary @@ -51,6 +55,7 @@ MultiByte v141 v142 + v143 diff --git a/builds/win32/msvc15/srp.vcxproj b/builds/win32/msvc15/srp.vcxproj index 5129b0e8a4..195f0cb93c 100644 --- a/builds/win32/msvc15/srp.vcxproj +++ b/builds/win32/msvc15/srp.vcxproj @@ -23,6 +23,7 @@ srp 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -30,24 +31,28 @@ MultiByte v141_xp v142 + v143 DynamicLibrary MultiByte v141_xp v142 + v143 DynamicLibrary MultiByte v141 v142 + v143 DynamicLibrary MultiByte v141 v142 + v143 diff --git a/builds/win32/msvc15/udf_compat.vcxproj b/builds/win32/msvc15/udf_compat.vcxproj index 0679607964..aa8b22f649 100644 --- a/builds/win32/msvc15/udf_compat.vcxproj +++ b/builds/win32/msvc15/udf_compat.vcxproj @@ -22,6 +22,7 @@ {6794EB8C-6425-422D-A3B0-14EED54C0E98} 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -30,6 +31,7 @@ MultiByte v141_xp v142 + v143 DynamicLibrary @@ -37,6 +39,7 @@ MultiByte v141_xp v142 + v143 DynamicLibrary @@ -44,6 +47,7 @@ MultiByte v141 v142 + v143 DynamicLibrary @@ -51,6 +55,7 @@ MultiByte v141 v142 + v143 diff --git a/builds/win32/msvc15/udr_engine.vcxproj b/builds/win32/msvc15/udr_engine.vcxproj index c1dd16764f..45451c863a 100644 --- a/builds/win32/msvc15/udr_engine.vcxproj +++ b/builds/win32/msvc15/udr_engine.vcxproj @@ -22,6 +22,7 @@ {20DEBF08-EF0A-4C94-ADEB-FE9BBA14588B} 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -30,6 +31,7 @@ MultiByte v141_xp v142 + v143 DynamicLibrary @@ -37,6 +39,7 @@ MultiByte v141_xp v142 + v143 DynamicLibrary @@ -44,6 +47,7 @@ MultiByte v141 v142 + v143 DynamicLibrary @@ -51,6 +55,7 @@ MultiByte v141 v142 + v143 diff --git a/builds/win32/msvc15/udrcpp_example.vcxproj b/builds/win32/msvc15/udrcpp_example.vcxproj index 68034e6555..3dc41033b6 100644 --- a/builds/win32/msvc15/udrcpp_example.vcxproj +++ b/builds/win32/msvc15/udrcpp_example.vcxproj @@ -22,6 +22,7 @@ {FF0FD8DF-1E5C-486E-B395-A620376A4633} 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -30,6 +31,7 @@ MultiByte v141_xp v142 + v143 DynamicLibrary @@ -37,6 +39,7 @@ MultiByte v141_xp v142 + v143 DynamicLibrary @@ -44,6 +47,7 @@ MultiByte v141 v142 + v143 DynamicLibrary @@ -51,6 +55,7 @@ MultiByte v141 v142 + v143 diff --git a/builds/win32/msvc15/yvalve.vcxproj b/builds/win32/msvc15/yvalve.vcxproj index 528fe512d7..d7596c42b0 100644 --- a/builds/win32/msvc15/yvalve.vcxproj +++ b/builds/win32/msvc15/yvalve.vcxproj @@ -90,6 +90,7 @@ yvalve 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -98,6 +99,7 @@ MultiByte v141_xp v142 + v143 DynamicLibrary @@ -105,6 +107,7 @@ MultiByte v141_xp v142 + v143 DynamicLibrary @@ -112,6 +115,7 @@ MultiByte v141 v142 + v143 DynamicLibrary @@ -119,6 +123,7 @@ MultiByte v141 v142 + v143 diff --git a/builds/win32/run_all.bat b/builds/win32/run_all.bat index 091ae1f50b..10bfb9f7fc 100644 --- a/builds/win32/run_all.bat +++ b/builds/win32/run_all.bat @@ -88,6 +88,10 @@ goto :END ::=============================== :: Set up the compiler environment +if DEFINED VS170COMNTOOLS ( +@devenv /? >nul 2>nul +@ if errorlevel 9009 (call "%VS170COMNTOOLS%\..\..\VC\Auxiliary\Build\vcvarsall.bat" %PROCESSOR_ARCHITECTURE%) else ( echo The file: & @echo "%VS170COMNTOOLS%\..\..\VC\Auxiliary\Build\vcvarsall.bat" %PROCESSOR_ARCHITECTURE% & echo has already been executed.) +) else ( if DEFINED VS160COMNTOOLS ( @devenv /? >nul 2>nul @if errorlevel 9009 (call "%VS160COMNTOOLS%\..\..\VC\Auxiliary\Build\vcvarsall.bat" %PROCESSOR_ARCHITECTURE%) else ( echo The file: & @echo "%VS160COMNTOOLS%\..\..\VC\Auxiliary\Build\vcvarsall.bat" %PROCESSOR_ARCHITECTURE% & echo has already been executed.) @@ -99,6 +103,7 @@ if DEFINED VS150COMNTOOLS ( @goto :HELP ) ) +) goto :END ::--------- diff --git a/builds/win32/setenvvar.bat b/builds/win32/setenvvar.bat index 0b9e1e7024..2041d78925 100644 --- a/builds/win32/setenvvar.bat +++ b/builds/win32/setenvvar.bat @@ -17,6 +17,10 @@ set FB_PROCESSOR_ARCHITECTURE=%PROCESSOR_ARCHITECTURE% ::================= :SET_MSVC_VER +if DEFINED VS170COMNTOOLS ( +@set MSVC_VERSION=15 +@set MSVC_CMAKE_GENERATOR=Visual Studio 17 2022 +) else ( if DEFINED VS160COMNTOOLS ( @set MSVC_VERSION=15 @set MSVC_CMAKE_GENERATOR=Visual Studio 16 2019 @@ -28,6 +32,7 @@ if DEFINED VS150COMNTOOLS ( @goto :HELP ) ) +) set VS_VER=msvc%MSVC_VERSION% diff --git a/examples/dbcrypt/msvc/DbCryptApp_MSVC15.vcxproj b/examples/dbcrypt/msvc/DbCryptApp_MSVC15.vcxproj index 6dd7e9c969..ca25dcab89 100644 --- a/examples/dbcrypt/msvc/DbCryptApp_MSVC15.vcxproj +++ b/examples/dbcrypt/msvc/DbCryptApp_MSVC15.vcxproj @@ -24,6 +24,7 @@ DbCrypt 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -31,6 +32,7 @@ true v141_xp v142 + v143 MultiByte @@ -38,6 +40,7 @@ false v141_xp v142 + v143 true MultiByte @@ -46,6 +49,7 @@ true v141 v142 + v143 MultiByte @@ -53,6 +57,7 @@ false v141 v142 + v143 true MultiByte diff --git a/examples/dbcrypt/msvc/DbCrypt_MSVC15.vcxproj b/examples/dbcrypt/msvc/DbCrypt_MSVC15.vcxproj index 9de2009081..959ce79ac3 100644 --- a/examples/dbcrypt/msvc/DbCrypt_MSVC15.vcxproj +++ b/examples/dbcrypt/msvc/DbCrypt_MSVC15.vcxproj @@ -24,6 +24,7 @@ DbCrypt 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -31,6 +32,7 @@ true v141_xp v142 + v143 MultiByte @@ -38,6 +40,7 @@ false v141_xp v142 + v143 true MultiByte @@ -46,6 +49,7 @@ true v141 v142 + v143 MultiByte @@ -53,6 +57,7 @@ false v141 v142 + v143 true MultiByte diff --git a/examples/dbcrypt/msvc/KeyHolder_MSVC15.vcxproj b/examples/dbcrypt/msvc/KeyHolder_MSVC15.vcxproj index e9b7f80a24..a7b6de3455 100644 --- a/examples/dbcrypt/msvc/KeyHolder_MSVC15.vcxproj +++ b/examples/dbcrypt/msvc/KeyHolder_MSVC15.vcxproj @@ -24,6 +24,7 @@ DbCrypt 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -31,6 +32,7 @@ true v141_xp v142 + v143 MultiByte @@ -38,6 +40,7 @@ false v141_xp v142 + v143 true MultiByte @@ -46,6 +49,7 @@ true v141 v142 + v143 MultiByte @@ -53,6 +57,7 @@ false v141 v142 + v143 true MultiByte diff --git a/examples/extauth/msvc/ExtAuth_MSVC15.vcxproj b/examples/extauth/msvc/ExtAuth_MSVC15.vcxproj index 84329156b6..02d7a92e12 100644 --- a/examples/extauth/msvc/ExtAuth_MSVC15.vcxproj +++ b/examples/extauth/msvc/ExtAuth_MSVC15.vcxproj @@ -24,6 +24,7 @@ ExtAuth 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 ExtAuth @@ -32,6 +33,7 @@ true v141_xp v142 + v143 MultiByte @@ -39,6 +41,7 @@ false v141_xp v142 + v143 true MultiByte @@ -47,6 +50,7 @@ true v141 v142 + v143 MultiByte @@ -54,6 +58,7 @@ false v141 v142 + v143 true MultiByte diff --git a/examples/extauth/msvc/KeyGen_MSVC15.vcxproj b/examples/extauth/msvc/KeyGen_MSVC15.vcxproj index f66d8376a0..3ece2cd1f5 100644 --- a/examples/extauth/msvc/KeyGen_MSVC15.vcxproj +++ b/examples/extauth/msvc/KeyGen_MSVC15.vcxproj @@ -24,6 +24,7 @@ KeyGen 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 KeyGen @@ -32,6 +33,7 @@ true v141_xp v142 + v143 MultiByte @@ -39,6 +41,7 @@ false v141_xp v142 + v143 true MultiByte @@ -47,6 +50,7 @@ true v141 v142 + v143 MultiByte @@ -54,6 +58,7 @@ false v141 v142 + v143 true MultiByte diff --git a/extern/cloop/src/cloop/cloop.vcxproj b/extern/cloop/src/cloop/cloop.vcxproj index 5d41189760..aee70a531b 100644 --- a/extern/cloop/src/cloop/cloop.vcxproj +++ b/extern/cloop/src/cloop/cloop.vcxproj @@ -23,6 +23,7 @@ {7A639C01-BE0D-4BEE-D2D4-17CA5AB54E57} 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -30,24 +31,28 @@ true v141 v142 + v143 Application true v141 v142 + v143 Application false v141 v142 + v143 Application false v141 v142 + v143 diff --git a/extern/cloop/src/tests/test1/test1-c-dll.vcxproj b/extern/cloop/src/tests/test1/test1-c-dll.vcxproj index 7c06babb9f..bc7832de58 100644 --- a/extern/cloop/src/tests/test1/test1-c-dll.vcxproj +++ b/extern/cloop/src/tests/test1/test1-c-dll.vcxproj @@ -24,6 +24,7 @@ {087FC91A-451C-853D-7439-51BF770E2380} 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -32,6 +33,7 @@ NotSet v141 v142 + v143 DynamicLibrary @@ -39,6 +41,7 @@ NotSet v141 v142 + v143 DynamicLibrary @@ -46,6 +49,7 @@ NotSet v141 v142 + v143 DynamicLibrary @@ -53,6 +57,7 @@ NotSet v141 v142 + v143 diff --git a/extern/cloop/src/tests/test1/test1-c-exe.vcxproj b/extern/cloop/src/tests/test1/test1-c-exe.vcxproj index 7aa0d55dd1..cbc4e75148 100644 --- a/extern/cloop/src/tests/test1/test1-c-exe.vcxproj +++ b/extern/cloop/src/tests/test1/test1-c-exe.vcxproj @@ -31,6 +31,7 @@ test1cexe 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -39,6 +40,7 @@ NotSet v141 v142 + v143 Application @@ -46,6 +48,7 @@ NotSet v141 v142 + v143 Application @@ -54,6 +57,7 @@ NotSet v141 v142 + v143 Application @@ -62,6 +66,7 @@ NotSet v141 v142 + v143 diff --git a/extern/cloop/src/tests/test1/test1-cpp-dll.vcxproj b/extern/cloop/src/tests/test1/test1-cpp-dll.vcxproj index dd54d357b7..ae40225fdc 100644 --- a/extern/cloop/src/tests/test1/test1-cpp-dll.vcxproj +++ b/extern/cloop/src/tests/test1/test1-cpp-dll.vcxproj @@ -24,6 +24,7 @@ {A97C1858-7DFA-8FEB-FEAE-2E9F1491692F} 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -32,6 +33,7 @@ NotSet v141 v142 + v143 DynamicLibrary @@ -39,6 +41,7 @@ NotSet v141 v142 + v143 DynamicLibrary @@ -46,6 +49,7 @@ NotSet v141 v142 + v143 DynamicLibrary @@ -53,6 +57,7 @@ NotSet v141 v142 + v143 diff --git a/extern/cloop/src/tests/test1/test1-cpp-exe.vcxproj b/extern/cloop/src/tests/test1/test1-cpp-exe.vcxproj index 85e832c6fd..f51f5ee680 100644 --- a/extern/cloop/src/tests/test1/test1-cpp-exe.vcxproj +++ b/extern/cloop/src/tests/test1/test1-cpp-exe.vcxproj @@ -24,6 +24,7 @@ test1cppexe 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -32,6 +33,7 @@ NotSet v141 v142 + v143 Application @@ -39,6 +41,7 @@ NotSet v141 v142 + v143 Application @@ -47,6 +50,7 @@ NotSet v141 v142 + v143 Application @@ -55,6 +59,7 @@ NotSet v141 v142 + v143 diff --git a/extern/decNumber/msvc/decNumber_MSVC15.vcxproj b/extern/decNumber/msvc/decNumber_MSVC15.vcxproj index 07dbd334be..bc9f1f2c70 100644 --- a/extern/decNumber/msvc/decNumber_MSVC15.vcxproj +++ b/extern/decNumber/msvc/decNumber_MSVC15.vcxproj @@ -63,6 +63,7 @@ decNumber 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -71,6 +72,7 @@ MultiByte v141_xp v142 + v143 StaticLibrary @@ -78,6 +80,7 @@ MultiByte v141 v142 + v143 StaticLibrary @@ -85,6 +88,7 @@ MultiByte v141_xp v142 + v143 StaticLibrary @@ -92,6 +96,7 @@ MultiByte v141 v142 + v143 diff --git a/extern/libtomcrypt/libtomcrypt_MSVC15.vcxproj b/extern/libtomcrypt/libtomcrypt_MSVC15.vcxproj index c7375e75a5..f8f3326515 100644 --- a/extern/libtomcrypt/libtomcrypt_MSVC15.vcxproj +++ b/extern/libtomcrypt/libtomcrypt_MSVC15.vcxproj @@ -24,6 +24,7 @@ libtomcrypt 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -32,6 +33,7 @@ NotSet v141_xp v142 + v143 StaticLibrary @@ -39,6 +41,7 @@ NotSet v141 v142 + v143 StaticLibrary @@ -46,6 +49,7 @@ NotSet v141_xp v142 + v143 StaticLibrary @@ -53,6 +57,7 @@ NotSet v141 v142 + v143 diff --git a/extern/libtommath/libtommath_MSVC15.vcxproj b/extern/libtommath/libtommath_MSVC15.vcxproj index e103a74bdd..7e443b4bac 100644 --- a/extern/libtommath/libtommath_MSVC15.vcxproj +++ b/extern/libtommath/libtommath_MSVC15.vcxproj @@ -24,6 +24,7 @@ libtommath 10.0.17763.0 10.0.19041.0 + 10.0.19041.0 @@ -32,6 +33,7 @@ MultiByte v141_xp v142 + v143 StaticLibrary @@ -39,6 +41,7 @@ MultiByte v141 v142 + v143 StaticLibrary @@ -46,6 +49,7 @@ MultiByte v141_xp v142 + v143 StaticLibrary @@ -53,6 +57,7 @@ MultiByte v141 v142 + v143