diff --git a/builds/win32/make_boot.bat b/builds/win32/make_boot.bat index ac4c17bfa8..31cead65f8 100644 --- a/builds/win32/make_boot.bat +++ b/builds/win32/make_boot.bat @@ -189,7 +189,7 @@ goto :EOF @echo Building re2... @mkdir %FB_ROOT_PATH%\extern\re2\builds\%FB_TARGET_PLATFORM% 2>nul @pushd %FB_ROOT_PATH%\extern\re2\builds\%FB_TARGET_PLATFORM% -@cmake -G "Visual Studio %MSVC_VERSION%" -A %FB_TARGET_PLATFORM% -S %FB_ROOT_PATH%\extern\re2 +@cmake -G "%MSVC_CMAKE_GENERATOR%" -A %FB_TARGET_PLATFORM% -S %FB_ROOT_PATH%\extern\re2 if errorlevel 1 call :boot2 re2 @cmake --build %FB_ROOT_PATH%\extern\re2\builds\%FB_TARGET_PLATFORM% --target ALL_BUILD --config Release > re2_Release_%FB_TARGET_PLATFORM%.log @cmake --build %FB_ROOT_PATH%\extern\re2\builds\%FB_TARGET_PLATFORM% --target ALL_BUILD --config Debug > re2_Debug_%FB_TARGET_PLATFORM%.log diff --git a/builds/win32/msvc15/FirebirdCommon.props b/builds/win32/msvc15/FirebirdCommon.props index 2b5c60289c..483376de00 100644 --- a/builds/win32/msvc15/FirebirdCommon.props +++ b/builds/win32/msvc15/FirebirdCommon.props @@ -43,4 +43,4 @@ RC_ARH_$(Platform);RC_TARGET_$(TargetName);RC_TARGET_NAME=$(TargetName);RC_TARGET_FILENAME=$(TargetFileName);%(PreprocessorDefinitions) - \ No newline at end of file + diff --git a/builds/win32/msvc15/alice.vcxproj b/builds/win32/msvc15/alice.vcxproj index 0aed0b4ec8..505731a721 100644 --- a/builds/win32/msvc15/alice.vcxproj +++ b/builds/win32/msvc15/alice.vcxproj @@ -20,32 +20,37 @@ {0D616380-1A5A-4230-A80B-021360E4E669} - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 StaticLibrary false MultiByte - v141_xp + v141_xp + v142 StaticLibrary false MultiByte - v141_xp + v141_xp + v142 StaticLibrary false MultiByte - v141 + v141 + v142 StaticLibrary false MultiByte - v141 + v141 + v142 @@ -147,4 +152,4 @@ - \ No newline at end of file + diff --git a/builds/win32/msvc15/btyacc.vcxproj b/builds/win32/msvc15/btyacc.vcxproj index 8c31efd8b9..5ce0088878 100644 --- a/builds/win32/msvc15/btyacc.vcxproj +++ b/builds/win32/msvc15/btyacc.vcxproj @@ -22,32 +22,37 @@ {57CDBF51-F1FB-4227-8C03-6F4134A7E234} btyacc ManagedCProj - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 Application MultiByte false - v141_xp + v141_xp + v142 Application MultiByte false - v141_xp + v141_xp + v142 Application MultiByte false - v141 + v141 + v142 Application MultiByte false - v141 + v141 + v142 @@ -185,4 +190,4 @@ - \ No newline at end of file + diff --git a/builds/win32/msvc15/build_msg.vcxproj b/builds/win32/msvc15/build_msg.vcxproj index a697a3f35d..a210936a12 100644 --- a/builds/win32/msvc15/build_msg.vcxproj +++ b/builds/win32/msvc15/build_msg.vcxproj @@ -21,32 +21,37 @@ {99A84638-DF3A-417F-895D-5BD88FC29411} build_msg - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 Application false MultiByte - v141_xp + v141_xp + v142 Application false MultiByte - v141_xp + v141_xp + v142 Application false MultiByte - v141 + v141 + v142 Application false MultiByte - v141 + v141 + v142 diff --git a/builds/win32/msvc15/burp.vcxproj b/builds/win32/msvc15/burp.vcxproj index 0104a2949b..ffc6e835dd 100644 --- a/builds/win32/msvc15/burp.vcxproj +++ b/builds/win32/msvc15/burp.vcxproj @@ -20,32 +20,37 @@ {D1507562-A363-4685-96AF-B036F5E5E47F} - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 StaticLibrary false MultiByte - v141_xp + v141_xp + v142 StaticLibrary false MultiByte - v141_xp + v141_xp + v142 StaticLibrary false MultiByte - v141 + v141 + v142 StaticLibrary false MultiByte - v141 + v141 + v142 @@ -155,4 +160,4 @@ - \ No newline at end of file + diff --git a/builds/win32/msvc15/chacha.vcxproj b/builds/win32/msvc15/chacha.vcxproj index 7dedf997d1..66ef372e15 100644 --- a/builds/win32/msvc15/chacha.vcxproj +++ b/builds/win32/msvc15/chacha.vcxproj @@ -21,28 +21,33 @@ {F2E1A852-5A4B-4162-9DA8-0363805FCFD0} chacha - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 DynamicLibrary MultiByte - v141_xp + v141_xp + v142 DynamicLibrary MultiByte - v141_xp + v141_xp + v142 DynamicLibrary MultiByte - v141 + v141 + v142 DynamicLibrary MultiByte - v141 + v141 + v142 @@ -195,4 +200,4 @@ - \ No newline at end of file + diff --git a/builds/win32/msvc15/common.vcxproj b/builds/win32/msvc15/common.vcxproj index 38aaa4906d..dfdfab5899 100644 --- a/builds/win32/msvc15/common.vcxproj +++ b/builds/win32/msvc15/common.vcxproj @@ -225,32 +225,35 @@ {15605F44-BFFD-444F-AD4C-55DC9D704465} common - 10.0.17763.0 StaticLibrary false MultiByte - v141_xp + v141_xp + v142 StaticLibrary false MultiByte - v141_xp + v141_xp + v142 StaticLibrary false MultiByte - v141 + v141 + v142 StaticLibrary false MultiByte - v141 + v141 + v142 diff --git a/builds/win32/msvc15/empbuild.vcxproj b/builds/win32/msvc15/empbuild.vcxproj index b23eb90ae2..de2e3b1602 100644 --- a/builds/win32/msvc15/empbuild.vcxproj +++ b/builds/win32/msvc15/empbuild.vcxproj @@ -21,32 +21,37 @@ {FC2859B9-56DB-40B4-86C4-2DE31ECE9144} empbuild - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 Application false MultiByte - v141_xp + v141_xp + v142 Application false MultiByte - v141_xp + v141_xp + v142 Application false MultiByte - v141 + v141 + v142 Application false MultiByte - v141 + v141 + v142 diff --git a/builds/win32/msvc15/engine.vcxproj b/builds/win32/msvc15/engine.vcxproj index e9d65e7e30..ed3d6f13e3 100644 --- a/builds/win32/msvc15/engine.vcxproj +++ b/builds/win32/msvc15/engine.vcxproj @@ -413,32 +413,37 @@ {F8798A49-9D20-451E-A7BD-FEB5237103B5} - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 DynamicLibrary false MultiByte - v141_xp + v141_xp + v142 DynamicLibrary false MultiByte - v141_xp + v141_xp + v142 DynamicLibrary false MultiByte - v141 + v141 + v142 DynamicLibrary false MultiByte - v141 + v141 + v142 diff --git a/builds/win32/msvc15/fb2control.vcxproj b/builds/win32/msvc15/fb2control.vcxproj index 998654a506..5a150d1087 100644 --- a/builds/win32/msvc15/fb2control.vcxproj +++ b/builds/win32/msvc15/fb2control.vcxproj @@ -20,7 +20,8 @@ {1AE02D41-7E24-43CC-9BCB-E4CEB6037D16} - 10.0.17134.0 + 10.0.17763.0 + 10.0.19041.0 MFCProj @@ -28,25 +29,29 @@ DynamicLibrary Static MultiByte - v141_xp + v141_xp + v142 DynamicLibrary Static MultiByte - v141_xp + v141_xp + v142 DynamicLibrary Dynamic MultiByte - v141 + v141 + v142 DynamicLibrary Static MultiByte - v141 + v141 + v142 @@ -258,4 +263,4 @@ - \ No newline at end of file + diff --git a/builds/win32/msvc15/fb_lock_print.vcxproj b/builds/win32/msvc15/fb_lock_print.vcxproj index c193caa548..3407abe1e5 100644 --- a/builds/win32/msvc15/fb_lock_print.vcxproj +++ b/builds/win32/msvc15/fb_lock_print.vcxproj @@ -20,32 +20,37 @@ {E8397148-0E9C-449B-9F45-7FB377A08242} - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 Application false MultiByte - v141_xp + v141_xp + v142 Application false MultiByte - v141_xp + v141_xp + v142 Application false MultiByte - v141 + v141 + v142 Application false MultiByte - v141 + v141 + v142 @@ -192,4 +197,4 @@ - \ No newline at end of file + diff --git a/builds/win32/msvc15/fbguard.vcxproj b/builds/win32/msvc15/fbguard.vcxproj index 09c3308244..37fc9b1fb0 100644 --- a/builds/win32/msvc15/fbguard.vcxproj +++ b/builds/win32/msvc15/fbguard.vcxproj @@ -20,32 +20,37 @@ {BBD83ED3-8A48-4FE8-B4B7-CB27730986B2} - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 Application false MultiByte - v141_xp + v141_xp + v142 Application false MultiByte - v141_xp + v141_xp + v142 Application false MultiByte - v141 + v141 + v142 Application false MultiByte - v141 + v141 + v142 @@ -208,4 +213,4 @@ - \ No newline at end of file + diff --git a/builds/win32/msvc15/fbrmclib.vcxproj b/builds/win32/msvc15/fbrmclib.vcxproj index 0ce4098d82..83fabe1af8 100644 --- a/builds/win32/msvc15/fbrmclib.vcxproj +++ b/builds/win32/msvc15/fbrmclib.vcxproj @@ -12,20 +12,23 @@ {FAF9AD25-8238-49E9-9AC9-8C56E190440A} - 10.0.17134.0 + 10.0.17763.0 + 10.0.19041.0 DynamicLibrary false MultiByte - v141_xp + v141_xp + v142 DynamicLibrary false MultiByte - v141_xp + v141_xp + v142 @@ -129,4 +132,4 @@ - \ No newline at end of file + diff --git a/builds/win32/msvc15/fbserver.vcxproj b/builds/win32/msvc15/fbserver.vcxproj index 0418db84c0..a73a079fb6 100644 --- a/builds/win32/msvc15/fbserver.vcxproj +++ b/builds/win32/msvc15/fbserver.vcxproj @@ -20,32 +20,37 @@ {23EC8DAA-6718-4EF3-979F-89F611C7D504} - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 Application false MultiByte - v141_xp + v141_xp + v142 Application false MultiByte - v141_xp + v141_xp + v142 Application false MultiByte - v141 + v141 + v142 Application false MultiByte - v141 + v141 + v142 @@ -233,4 +238,4 @@ - \ No newline at end of file + diff --git a/builds/win32/msvc15/fbsvcmgr.vcxproj b/builds/win32/msvc15/fbsvcmgr.vcxproj index 292c68d26b..2ae240da41 100644 --- a/builds/win32/msvc15/fbsvcmgr.vcxproj +++ b/builds/win32/msvc15/fbsvcmgr.vcxproj @@ -20,32 +20,37 @@ {EFB07DBC-36E3-4C54-B941-3CDAFAACF47B} - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 Application false MultiByte - v141_xp + v141_xp + v142 Application false MultiByte - v141_xp + v141_xp + v142 Application false MultiByte - v141 + v141 + v142 Application false MultiByte - v141 + v141 + v142 @@ -188,4 +193,4 @@ - \ No newline at end of file + diff --git a/builds/win32/msvc15/fbtrace.vcxproj b/builds/win32/msvc15/fbtrace.vcxproj index 4b46cccbe4..549a04756a 100644 --- a/builds/win32/msvc15/fbtrace.vcxproj +++ b/builds/win32/msvc15/fbtrace.vcxproj @@ -20,28 +20,33 @@ {53F75437-15B8-4A5C-86BF-E238CC68FCBC} - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 DynamicLibrary MultiByte - v141_xp + v141_xp + v142 DynamicLibrary MultiByte - v141_xp + v141_xp + v142 DynamicLibrary MultiByte - v141 + v141 + v142 DynamicLibrary MultiByte - v141 + v141 + v142 @@ -209,4 +214,4 @@ - \ No newline at end of file + diff --git a/builds/win32/msvc15/fbtracemgr.vcxproj b/builds/win32/msvc15/fbtracemgr.vcxproj index 9681eb7400..66fb330877 100644 --- a/builds/win32/msvc15/fbtracemgr.vcxproj +++ b/builds/win32/msvc15/fbtracemgr.vcxproj @@ -22,32 +22,37 @@ {58C7E370-0EDD-4F5E-8617-3F5071170205} fbtracemgr Win32Proj - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 Application false MultiByte - v141_xp + v141_xp + v142 Application false MultiByte - v141_xp + v141_xp + v142 Application false MultiByte - v141 + v141 + v142 Application false MultiByte - v141 + v141 + v142 @@ -191,4 +196,4 @@ - \ No newline at end of file + diff --git a/builds/win32/msvc15/gbak.vcxproj b/builds/win32/msvc15/gbak.vcxproj index 4e3bad3de5..156823e04a 100644 --- a/builds/win32/msvc15/gbak.vcxproj +++ b/builds/win32/msvc15/gbak.vcxproj @@ -20,32 +20,37 @@ {B732F5D2-B5D9-417F-B156-D790F466CB8E} - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 Application false MultiByte - v141_xp + v141_xp + v142 Application false MultiByte - v141_xp + v141_xp + v142 Application false MultiByte - v141 + v141 + v142 Application false MultiByte - v141 + v141 + v142 @@ -211,4 +216,4 @@ - \ No newline at end of file + diff --git a/builds/win32/msvc15/gfix.vcxproj b/builds/win32/msvc15/gfix.vcxproj index dbf7c2584c..126e3cb92a 100644 --- a/builds/win32/msvc15/gfix.vcxproj +++ b/builds/win32/msvc15/gfix.vcxproj @@ -21,32 +21,37 @@ {44A9E4AD-B932-4620-B319-431A153BB341} gfix - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 Application false MultiByte - v141_xp + v141_xp + v142 Application false MultiByte - v141_xp + v141_xp + v142 Application false MultiByte - v141 + v141 + v142 Application false MultiByte - v141 + v141 + v142 @@ -192,4 +197,4 @@ - \ No newline at end of file + diff --git a/builds/win32/msvc15/gpre.vcxproj b/builds/win32/msvc15/gpre.vcxproj index 8f729f3679..2d5f215d99 100644 --- a/builds/win32/msvc15/gpre.vcxproj +++ b/builds/win32/msvc15/gpre.vcxproj @@ -21,32 +21,37 @@ {D84F0839-28A4-40B2-B5F4-F5E1E7F48FD0} gpre - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 Application false MultiByte - v141_xp + v141_xp + v142 Application false MultiByte - v141_xp + v141_xp + v142 Application false MultiByte - v141 + v141 + v142 Application false MultiByte - v141 + v141 + v142 @@ -206,4 +211,4 @@ - \ No newline at end of file + diff --git a/builds/win32/msvc15/gpre_boot.vcxproj b/builds/win32/msvc15/gpre_boot.vcxproj index 04d707d38b..bcc18b146c 100644 --- a/builds/win32/msvc15/gpre_boot.vcxproj +++ b/builds/win32/msvc15/gpre_boot.vcxproj @@ -21,32 +21,37 @@ {8348521F-4480-4A1D-AE3B-E260235E9860} gpre_boot - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 Application false MultiByte - v141_xp + v141_xp + v142 Application false MultiByte - v141_xp + v141_xp + v142 Application false MultiByte - v141 + v141 + v142 Application false MultiByte - v141 + v141 + v142 @@ -201,4 +206,4 @@ - \ No newline at end of file + diff --git a/builds/win32/msvc15/gpre_common.vcxproj b/builds/win32/msvc15/gpre_common.vcxproj index 4c10444d24..6c9d881048 100644 --- a/builds/win32/msvc15/gpre_common.vcxproj +++ b/builds/win32/msvc15/gpre_common.vcxproj @@ -21,32 +21,37 @@ {2925B855-5975-44AE-BB00-1217A2A4E511} gpre - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 StaticLibrary false MultiByte - v141_xp + v141_xp + v142 StaticLibrary false MultiByte - v141_xp + v141_xp + v142 StaticLibrary false MultiByte - v141 + v141 + v142 StaticLibrary false MultiByte - v141 + v141 + v142 @@ -222,4 +227,4 @@ - \ No newline at end of file + diff --git a/builds/win32/msvc15/gsec.vcxproj b/builds/win32/msvc15/gsec.vcxproj index 5f833a0b96..5be6cc4bf8 100644 --- a/builds/win32/msvc15/gsec.vcxproj +++ b/builds/win32/msvc15/gsec.vcxproj @@ -20,32 +20,37 @@ {7043CC61-DEC1-4C6B-86B9-0E911D1094C9} - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 Application false MultiByte - v141_xp + v141_xp + v142 Application false MultiByte - v141_xp + v141_xp + v142 Application false MultiByte - v141 + v141 + v142 Application false MultiByte - v141 + v141 + v142 @@ -192,4 +197,4 @@ - \ No newline at end of file + diff --git a/builds/win32/msvc15/gsplit.vcxproj b/builds/win32/msvc15/gsplit.vcxproj index aebab4136b..f2f72aeacc 100644 --- a/builds/win32/msvc15/gsplit.vcxproj +++ b/builds/win32/msvc15/gsplit.vcxproj @@ -21,32 +21,37 @@ {B7F22B7F-9937-4874-9A8B-6AB4E36E74A5} gsplit - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 Application false MultiByte - v141_xp + v141_xp + v142 Application false MultiByte - v141_xp + v141_xp + v142 Application false MultiByte - v141 + v141 + v142 Application false MultiByte - v141 + v141 + v142 @@ -204,4 +209,4 @@ - \ No newline at end of file + diff --git a/builds/win32/msvc15/gstat.vcxproj b/builds/win32/msvc15/gstat.vcxproj index 677983308c..9561bb5420 100644 --- a/builds/win32/msvc15/gstat.vcxproj +++ b/builds/win32/msvc15/gstat.vcxproj @@ -20,32 +20,37 @@ {7E862973-37C4-4202-80E7-490ED4DEDA14} - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 Application false MultiByte - v141_xp + v141_xp + v142 Application false MultiByte - v141_xp + v141_xp + v142 Application false MultiByte - v141 + v141 + v142 Application false MultiByte - v141 + v141 + v142 @@ -199,4 +204,4 @@ - \ No newline at end of file + diff --git a/builds/win32/msvc15/ib_util.vcxproj b/builds/win32/msvc15/ib_util.vcxproj index 554cbf642f..96dc5695e0 100644 --- a/builds/win32/msvc15/ib_util.vcxproj +++ b/builds/win32/msvc15/ib_util.vcxproj @@ -20,32 +20,37 @@ {EABA0FF3-1C4D-4FAB-8418-31C9061F3F0D} - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 DynamicLibrary false MultiByte - v141_xp + v141_xp + v142 DynamicLibrary false MultiByte - v141_xp + v141_xp + v142 DynamicLibrary false MultiByte - v141 + v141 + v142 DynamicLibrary false MultiByte - v141 + v141 + v142 @@ -207,4 +212,4 @@ - \ No newline at end of file + diff --git a/builds/win32/msvc15/instclient.vcxproj b/builds/win32/msvc15/instclient.vcxproj index 595fb86a7c..181dd5ea17 100644 --- a/builds/win32/msvc15/instclient.vcxproj +++ b/builds/win32/msvc15/instclient.vcxproj @@ -21,32 +21,37 @@ {C6A31374-178C-4680-A404-76BE24D0229B} instclient - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 Application false MultiByte - v141_xp + v141_xp + v142 Application false MultiByte - v141_xp + v141_xp + v142 Application false MultiByte - v141 + v141 + v142 Application false MultiByte - v141 + v141 + v142 @@ -191,4 +196,4 @@ - \ No newline at end of file + diff --git a/builds/win32/msvc15/instreg.vcxproj b/builds/win32/msvc15/instreg.vcxproj index 75909d0aa8..88f6652274 100644 --- a/builds/win32/msvc15/instreg.vcxproj +++ b/builds/win32/msvc15/instreg.vcxproj @@ -21,32 +21,37 @@ {19470DE6-1975-4F9B-B1BE-E87A83240B15} instreg - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 Application false MultiByte - v141_xp + v141_xp + v142 Application false MultiByte - v141_xp + v141_xp + v142 Application false MultiByte - v141 + v141 + v142 Application false MultiByte - v141 + v141 + v142 @@ -190,4 +195,4 @@ - \ No newline at end of file + diff --git a/builds/win32/msvc15/instsvc.vcxproj b/builds/win32/msvc15/instsvc.vcxproj index c8b864d2c9..bddc2b918f 100644 --- a/builds/win32/msvc15/instsvc.vcxproj +++ b/builds/win32/msvc15/instsvc.vcxproj @@ -21,32 +21,37 @@ {72894398-38CA-47A6-95FE-9647DE2BE968} instsvc - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 Application false MultiByte - v141_xp + v141_xp + v142 Application false MultiByte - v141_xp + v141_xp + v142 Application false MultiByte - v141 + v141 + v142 Application false MultiByte - v141 + v141 + v142 @@ -202,4 +207,4 @@ - \ No newline at end of file + diff --git a/builds/win32/msvc15/intl.vcxproj b/builds/win32/msvc15/intl.vcxproj index 8f6a4c5dcd..7fb6390e61 100644 --- a/builds/win32/msvc15/intl.vcxproj +++ b/builds/win32/msvc15/intl.vcxproj @@ -20,32 +20,37 @@ {DFFA2117-E6A8-4806-BB69-94DAC8F8F42A} - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 DynamicLibrary false MultiByte - v141_xp + v141_xp + v142 DynamicLibrary false MultiByte - v141_xp + v141_xp + v142 DynamicLibrary false MultiByte - v141 + v141 + v142 DynamicLibrary false MultiByte - v141 + v141 + v142 @@ -264,4 +269,4 @@ - \ No newline at end of file + diff --git a/builds/win32/msvc15/intlbuild.vcxproj b/builds/win32/msvc15/intlbuild.vcxproj index e82c203efa..9b9dc33be5 100644 --- a/builds/win32/msvc15/intlbuild.vcxproj +++ b/builds/win32/msvc15/intlbuild.vcxproj @@ -20,32 +20,37 @@ {9546EF04-1326-464B-A6ED-395C60DD63CC} - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 Application false MultiByte - v141_xp + v141_xp + v142 Application false MultiByte - v141_xp + v141_xp + v142 Application false MultiByte - v141 + v141 + v142 Application false MultiByte - v141 + v141 + v142 @@ -178,4 +183,4 @@ - \ No newline at end of file + diff --git a/builds/win32/msvc15/isql.vcxproj b/builds/win32/msvc15/isql.vcxproj index af4b94877b..db9e4559d1 100644 --- a/builds/win32/msvc15/isql.vcxproj +++ b/builds/win32/msvc15/isql.vcxproj @@ -21,32 +21,37 @@ {DEE75AD5-F165-40E1-80B2-400E27725D5C} isql - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 Application false MultiByte - v141_xp + v141_xp + v142 Application false MultiByte - v141_xp + v141_xp + v142 Application false MultiByte - v141 + v141 + v142 Application false MultiByte - v141 + v141 + v142 @@ -217,4 +222,4 @@ - \ No newline at end of file + diff --git a/builds/win32/msvc15/legacy_auth.vcxproj b/builds/win32/msvc15/legacy_auth.vcxproj index 66824c107f..7d5570e55e 100644 --- a/builds/win32/msvc15/legacy_auth.vcxproj +++ b/builds/win32/msvc15/legacy_auth.vcxproj @@ -20,28 +20,33 @@ {062BD3C7-2D01-44F6-8D79-070F688C559F} - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 DynamicLibrary MultiByte - v141_xp + v141_xp + v142 DynamicLibrary MultiByte - v141_xp + v141_xp + v142 DynamicLibrary MultiByte - v141 + v141 + v142 DynamicLibrary MultiByte - v141 + v141 + v142 @@ -195,4 +200,4 @@ - \ No newline at end of file + diff --git a/builds/win32/msvc15/legacy_usermanager.vcxproj b/builds/win32/msvc15/legacy_usermanager.vcxproj index 7430adbbb3..04abc5bbe7 100644 --- a/builds/win32/msvc15/legacy_usermanager.vcxproj +++ b/builds/win32/msvc15/legacy_usermanager.vcxproj @@ -20,28 +20,33 @@ {D836FBF5-071E-4E04-8D63-C7EB6701B296} - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 DynamicLibrary MultiByte - v141_xp + v141_xp + v142 DynamicLibrary MultiByte - v141_xp + v141_xp + v142 DynamicLibrary MultiByte - v141 + v141 + v142 DynamicLibrary MultiByte - v141 + v141 + v142 @@ -198,4 +203,4 @@ - \ No newline at end of file + diff --git a/builds/win32/msvc15/nbackup.vcxproj b/builds/win32/msvc15/nbackup.vcxproj index f5db2a4f86..d907715245 100644 --- a/builds/win32/msvc15/nbackup.vcxproj +++ b/builds/win32/msvc15/nbackup.vcxproj @@ -20,32 +20,37 @@ {01A41DFA-8908-4576-A1F1-C8BC7EAE39A1} - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 Application false MultiByte - v141_xp + v141_xp + v142 Application false MultiByte - v141_xp + v141_xp + v142 Application false MultiByte - v141 + v141 + v142 Application false MultiByte - v141 + v141 + v142 @@ -195,4 +200,4 @@ - \ No newline at end of file + diff --git a/builds/win32/msvc15/remote.vcxproj b/builds/win32/msvc15/remote.vcxproj index 824f8f8c8b..3434497cfd 100644 --- a/builds/win32/msvc15/remote.vcxproj +++ b/builds/win32/msvc15/remote.vcxproj @@ -20,32 +20,37 @@ {4BCC693D-1745-45ED-8302-E5E2F979549A} - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 StaticLibrary false MultiByte - v141_xp + v141_xp + v142 StaticLibrary false MultiByte - v141_xp + v141_xp + v142 StaticLibrary false MultiByte - v141 + v141 + v142 StaticLibrary false MultiByte - v141 + v141 + v142 @@ -167,4 +172,4 @@ - \ No newline at end of file + diff --git a/builds/win32/msvc15/srp.vcxproj b/builds/win32/msvc15/srp.vcxproj index c540213dbd..5129b0e8a4 100644 --- a/builds/win32/msvc15/srp.vcxproj +++ b/builds/win32/msvc15/srp.vcxproj @@ -21,28 +21,33 @@ {BD00D28E-6667-414E-A4B1-6BEFC07ADB42} srp - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 DynamicLibrary MultiByte - v141_xp + v141_xp + v142 DynamicLibrary MultiByte - v141_xp + v141_xp + v142 DynamicLibrary MultiByte - v141 + v141 + v142 DynamicLibrary MultiByte - v141 + v141 + v142 @@ -198,4 +203,4 @@ - \ No newline at end of file + diff --git a/builds/win32/msvc15/udf_compat.vcxproj b/builds/win32/msvc15/udf_compat.vcxproj index d3f63cb210..0679607964 100644 --- a/builds/win32/msvc15/udf_compat.vcxproj +++ b/builds/win32/msvc15/udf_compat.vcxproj @@ -20,32 +20,37 @@ {6794EB8C-6425-422D-A3B0-14EED54C0E98} - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 DynamicLibrary false MultiByte - v141_xp + v141_xp + v142 DynamicLibrary false MultiByte - v141_xp + v141_xp + v142 DynamicLibrary false MultiByte - v141 + v141 + v142 DynamicLibrary false MultiByte - v141 + v141 + v142 @@ -192,4 +197,4 @@ - \ No newline at end of file + diff --git a/builds/win32/msvc15/udr_engine.vcxproj b/builds/win32/msvc15/udr_engine.vcxproj index 71102206d8..c1dd16764f 100644 --- a/builds/win32/msvc15/udr_engine.vcxproj +++ b/builds/win32/msvc15/udr_engine.vcxproj @@ -20,32 +20,37 @@ {20DEBF08-EF0A-4C94-ADEB-FE9BBA14588B} - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 DynamicLibrary false MultiByte - v141_xp + v141_xp + v142 DynamicLibrary false MultiByte - v141_xp + v141_xp + v142 DynamicLibrary false MultiByte - v141 + v141 + v142 DynamicLibrary false MultiByte - v141 + v141 + v142 @@ -217,4 +222,4 @@ - \ No newline at end of file + diff --git a/builds/win32/msvc15/udrcpp_example.vcxproj b/builds/win32/msvc15/udrcpp_example.vcxproj index 503586897d..68034e6555 100644 --- a/builds/win32/msvc15/udrcpp_example.vcxproj +++ b/builds/win32/msvc15/udrcpp_example.vcxproj @@ -20,32 +20,37 @@ {FF0FD8DF-1E5C-486E-B395-A620376A4633} - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 DynamicLibrary false MultiByte - v141_xp + v141_xp + v142 DynamicLibrary false MultiByte - v141_xp + v141_xp + v142 DynamicLibrary false MultiByte - v141 + v141 + v142 DynamicLibrary false MultiByte - v141 + v141 + v142 @@ -230,4 +235,4 @@ - \ No newline at end of file + diff --git a/builds/win32/msvc15/yvalve.vcxproj b/builds/win32/msvc15/yvalve.vcxproj index 112d3f9d4b..528fe512d7 100644 --- a/builds/win32/msvc15/yvalve.vcxproj +++ b/builds/win32/msvc15/yvalve.vcxproj @@ -88,32 +88,37 @@ {4FE03933-98CD-4879-A135-FD9430087A6B} yvalve - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 DynamicLibrary false MultiByte - v141_xp + v141_xp + v142 DynamicLibrary false MultiByte - v141_xp + v141_xp + v142 DynamicLibrary false MultiByte - v141 + v141 + v142 DynamicLibrary false MultiByte - v141 + v141 + v142 @@ -231,4 +236,4 @@ - \ No newline at end of file + diff --git a/builds/win32/run_all.bat b/builds/win32/run_all.bat index e13429ec72..091ae1f50b 100644 --- a/builds/win32/run_all.bat +++ b/builds/win32/run_all.bat @@ -88,27 +88,17 @@ goto :END ::=============================== :: Set up the compiler environment +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.) +) else ( if DEFINED VS150COMNTOOLS ( @devenv /? >nul 2>nul @if errorlevel 9009 (call "%VS150COMNTOOLS%\..\..\VC\Auxiliary\Build\vcvarsall.bat" %PROCESSOR_ARCHITECTURE%) else ( echo The file: & @echo "%VS150COMNTOOLS%\..\..\VC\Auxiliary\Build\vcvarsall.bat" %PROCESSOR_ARCHITECTURE% & echo has already been executed.) ) else ( -if DEFINED VS140COMNTOOLS ( -@devenv /? >nul 2>nul -@if errorlevel 9009 (call "%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat" %PROCESSOR_ARCHITECTURE%) else ( echo The file: & @echo "%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat" %PROCESSOR_ARCHITECTURE% & echo has already been executed.) -) else ( -if DEFINED VS120COMNTOOLS ( -@devenv /? >nul 2>nul -@if errorlevel 9009 (call "%VS120COMNTOOLS%\..\..\VC\vcvarsall.bat" %PROCESSOR_ARCHITECTURE%) else ( echo The file: & @echo "%VS120COMNTOOLS%\..\..\VC\vcvarsall.bat" %PROCESSOR_ARCHITECTURE% & echo has already been executed.) -) else ( -if DEFINED VS100COMNTOOLS ( -@devenv /? >nul 2>nul -@if errorlevel 9009 (call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat" %PROCESSOR_ARCHITECTURE%) else ( echo The file: & @echo "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat" %PROCESSOR_ARCHITECTURE% & echo has already been executed.) -) else ( @goto :HELP ) ) -) -) goto :END ::--------- diff --git a/builds/win32/setenvvar.bat b/builds/win32/setenvvar.bat index 5ebe49eea7..0b9e1e7024 100644 --- a/builds/win32/setenvvar.bat +++ b/builds/win32/setenvvar.bat @@ -17,19 +17,17 @@ set FB_PROCESSOR_ARCHITECTURE=%PROCESSOR_ARCHITECTURE% ::================= :SET_MSVC_VER +if DEFINED VS160COMNTOOLS ( +@set MSVC_VERSION=15 +@set MSVC_CMAKE_GENERATOR=Visual Studio 16 2019 +) else ( if DEFINED VS150COMNTOOLS ( @set MSVC_VERSION=15 -) else ( -if DEFINED VS140COMNTOOLS ( -@set MSVC_VERSION=14 -) else ( -if DEFINED VS120COMNTOOLS ( -@set MSVC_VERSION=12 +@set MSVC_CMAKE_GENERATOR=Visual Studio 15 ) else ( @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 4b3d413230..6dd7e9c969 100644 --- a/examples/dbcrypt/msvc/DbCryptApp_MSVC15.vcxproj +++ b/examples/dbcrypt/msvc/DbCryptApp_MSVC15.vcxproj @@ -22,32 +22,37 @@ 15.0 {D702CB26-9FB9-4A6F-B2F8-EF9961578B70} DbCrypt - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 Application true - v141_xp + v141_xp + v142 MultiByte Application false - v141_xp + v141_xp + v142 true MultiByte Application true - v141 + v141 + v142 MultiByte Application false - v141 + v141 + v142 true MultiByte @@ -163,4 +168,4 @@ - \ No newline at end of file + diff --git a/examples/dbcrypt/msvc/DbCrypt_MSVC15.vcxproj b/examples/dbcrypt/msvc/DbCrypt_MSVC15.vcxproj index eecf3f9301..9de2009081 100644 --- a/examples/dbcrypt/msvc/DbCrypt_MSVC15.vcxproj +++ b/examples/dbcrypt/msvc/DbCrypt_MSVC15.vcxproj @@ -22,32 +22,37 @@ 15.0 {7F94BDD8-ED23-437E-9890-485052F14166} DbCrypt - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 DynamicLibrary true - v141_xp + v141_xp + v142 MultiByte DynamicLibrary false - v141_xp + v141_xp + v142 true MultiByte DynamicLibrary true - v141 + v141 + v142 MultiByte DynamicLibrary false - v141 + v141 + v142 true MultiByte @@ -158,4 +163,4 @@ - \ No newline at end of file + diff --git a/examples/dbcrypt/msvc/KeyHolder_MSVC15.vcxproj b/examples/dbcrypt/msvc/KeyHolder_MSVC15.vcxproj index 9a4bad9425..e9b7f80a24 100644 --- a/examples/dbcrypt/msvc/KeyHolder_MSVC15.vcxproj +++ b/examples/dbcrypt/msvc/KeyHolder_MSVC15.vcxproj @@ -22,32 +22,37 @@ 15.0 {17D033E3-0764-4E6D-859E-FA42977A84CA} DbCrypt - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 DynamicLibrary true - v141_xp + v141_xp + v142 MultiByte DynamicLibrary false - v141_xp + v141_xp + v142 true MultiByte DynamicLibrary true - v141 + v141 + v142 MultiByte DynamicLibrary false - v141 + v141 + v142 true MultiByte @@ -158,4 +163,4 @@ - \ No newline at end of file + diff --git a/examples/extauth/msvc/ExtAuth_MSVC15.vcxproj b/examples/extauth/msvc/ExtAuth_MSVC15.vcxproj index b738dc4e06..84329156b6 100644 --- a/examples/extauth/msvc/ExtAuth_MSVC15.vcxproj +++ b/examples/extauth/msvc/ExtAuth_MSVC15.vcxproj @@ -22,33 +22,38 @@ 15.0 {6DAB6DFA-D754-4698-876E-40ECF688AA07} ExtAuth - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 ExtAuth DynamicLibrary true - v141_xp + v141_xp + v142 MultiByte DynamicLibrary false - v141_xp + v141_xp + v142 true MultiByte DynamicLibrary true - v141 + v141 + v142 MultiByte DynamicLibrary false - v141 + v141 + v142 true MultiByte @@ -172,4 +177,4 @@ - \ No newline at end of file + diff --git a/examples/extauth/msvc/KeyGen_MSVC15.vcxproj b/examples/extauth/msvc/KeyGen_MSVC15.vcxproj index 5f8cbc908c..f66d8376a0 100644 --- a/examples/extauth/msvc/KeyGen_MSVC15.vcxproj +++ b/examples/extauth/msvc/KeyGen_MSVC15.vcxproj @@ -22,33 +22,38 @@ 15.0 {A3AB86E1-D9E1-4B6B-B5E7-59524CB2602A} KeyGen - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 KeyGen Application true - v141_xp + v141_xp + v142 MultiByte Application false - v141_xp + v141_xp + v142 true MultiByte Application true - v141 + v141 + v142 MultiByte Application false - v141 + v141 + v142 true MultiByte @@ -168,4 +173,4 @@ - \ No newline at end of file + diff --git a/extern/cloop/src/cloop/cloop.vcxproj b/extern/cloop/src/cloop/cloop.vcxproj index 12348af33e..5d41189760 100644 --- a/extern/cloop/src/cloop/cloop.vcxproj +++ b/extern/cloop/src/cloop/cloop.vcxproj @@ -21,28 +21,33 @@ Win32Proj {7A639C01-BE0D-4BEE-D2D4-17CA5AB54E57} - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 Application true - v141 + v141 + v142 Application true - v141 + v141 + v142 Application false - v141 + v141 + v142 Application false - v141 + v141 + v142 @@ -153,4 +158,4 @@ - \ No newline at end of file + diff --git a/extern/cloop/src/tests/test1/test1-c-dll.vcxproj b/extern/cloop/src/tests/test1/test1-c-dll.vcxproj index ef57913f3e..7c06babb9f 100644 --- a/extern/cloop/src/tests/test1/test1-c-dll.vcxproj +++ b/extern/cloop/src/tests/test1/test1-c-dll.vcxproj @@ -22,32 +22,37 @@ Win32Proj test1-c-dll {087FC91A-451C-853D-7439-51BF770E2380} - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 DynamicLibrary true NotSet - v141 + v141 + v142 DynamicLibrary true NotSet - v141 + v141 + v142 DynamicLibrary false NotSet - v141 + v141 + v142 DynamicLibrary false NotSet - v141 + v141 + v142 @@ -159,4 +164,4 @@ - \ No newline at end of file + diff --git a/extern/cloop/src/tests/test1/test1-c-exe.vcxproj b/extern/cloop/src/tests/test1/test1-c-exe.vcxproj index fca1b8b623..7aa0d55dd1 100644 --- a/extern/cloop/src/tests/test1/test1-c-exe.vcxproj +++ b/extern/cloop/src/tests/test1/test1-c-exe.vcxproj @@ -29,34 +29,39 @@ {4495AE41-C12E-446C-AE2F-5CECF5F80B17} Win32Proj test1cexe - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 Application true NotSet - v141 + v141 + v142 Application true NotSet - v141 + v141 + v142 Application false true NotSet - v141 + v141 + v142 Application false true NotSet - v141 + v141 + v142 @@ -161,4 +166,4 @@ - \ No newline at end of file + diff --git a/extern/cloop/src/tests/test1/test1-cpp-dll.vcxproj b/extern/cloop/src/tests/test1/test1-cpp-dll.vcxproj index 9f12716a2b..dd54d357b7 100644 --- a/extern/cloop/src/tests/test1/test1-cpp-dll.vcxproj +++ b/extern/cloop/src/tests/test1/test1-cpp-dll.vcxproj @@ -22,32 +22,37 @@ Win32Proj test1-cpp-dll {A97C1858-7DFA-8FEB-FEAE-2E9F1491692F} - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 DynamicLibrary true NotSet - v141 + v141 + v142 DynamicLibrary true NotSet - v141 + v141 + v142 DynamicLibrary false NotSet - v141 + v141 + v142 DynamicLibrary false NotSet - v141 + v141 + v142 @@ -158,4 +163,4 @@ - \ No newline at end of file + diff --git a/extern/cloop/src/tests/test1/test1-cpp-exe.vcxproj b/extern/cloop/src/tests/test1/test1-cpp-exe.vcxproj index 4d4e59be20..85e832c6fd 100644 --- a/extern/cloop/src/tests/test1/test1-cpp-exe.vcxproj +++ b/extern/cloop/src/tests/test1/test1-cpp-exe.vcxproj @@ -22,34 +22,39 @@ {096EBD8E-C0FC-4286-A01D-89D562F3AE12} Win32Proj test1cppexe - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 Application true NotSet - v141 + v141 + v142 Application true NotSet - v141 + v141 + v142 Application false true NotSet - v141 + v141 + v142 Application false true NotSet - v141 + v141 + v142 @@ -160,4 +165,4 @@ - \ No newline at end of file + diff --git a/extern/decNumber/msvc/decNumber_MSVC15.vcxproj b/extern/decNumber/msvc/decNumber_MSVC15.vcxproj index b536a48962..07dbd334be 100644 --- a/extern/decNumber/msvc/decNumber_MSVC15.vcxproj +++ b/extern/decNumber/msvc/decNumber_MSVC15.vcxproj @@ -61,32 +61,37 @@ decNumber {BE4D2DDC-59A0-4CD7-848E-231E13785335} decNumber - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 StaticLibrary false MultiByte - v141_xp + v141_xp + v142 StaticLibrary false MultiByte - v141 + v141 + v142 StaticLibrary false MultiByte - v141_xp + v141_xp + v142 StaticLibrary false MultiByte - v141 + v141 + v142 @@ -269,4 +274,4 @@ - \ No newline at end of file + diff --git a/extern/libtomcrypt/libtomcrypt_MSVC15.vcxproj b/extern/libtomcrypt/libtomcrypt_MSVC15.vcxproj index c261ebcb46..c7375e75a5 100644 --- a/extern/libtomcrypt/libtomcrypt_MSVC15.vcxproj +++ b/extern/libtomcrypt/libtomcrypt_MSVC15.vcxproj @@ -22,32 +22,37 @@ libtomcrypt {E3802982-DCB6-4D85-A2BD-6B08F0657E79} libtomcrypt - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 StaticLibrary false NotSet - v141_xp + v141_xp + v142 StaticLibrary false NotSet - v141 + v141 + v142 StaticLibrary false NotSet - v141_xp + v141_xp + v142 StaticLibrary false NotSet - v141 + v141 + v142 @@ -655,4 +660,4 @@ - \ No newline at end of file + diff --git a/extern/libtommath/libtommath_MSVC15.vcxproj b/extern/libtommath/libtommath_MSVC15.vcxproj index 83567cf052..e103a74bdd 100644 --- a/extern/libtommath/libtommath_MSVC15.vcxproj +++ b/extern/libtommath/libtommath_MSVC15.vcxproj @@ -22,32 +22,37 @@ libtommath {42109FEE-B0B9-4FCD-9E56-2863BF8C55D2} libtommath - 10.0.17763.0 + 10.0.17763.0 + 10.0.19041.0 StaticLibrary false MultiByte - v141_xp + v141_xp + v142 StaticLibrary false MultiByte - v141 + v141 + v142 StaticLibrary false MultiByte - v141_xp + v141_xp + v142 StaticLibrary false MultiByte - v141 + v141 + v142 @@ -356,4 +361,4 @@ - \ No newline at end of file +