From 8f1b412c1f8387252c943c6d67d11a8285149bab Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Wed, 19 Jun 2019 11:49:44 +0200 Subject: [PATCH] Switch to Visual Studio 2019 Signed-off-by: Simon Rozman --- MSI/MSICA | 2 +- Updater | 2 +- ZRCola.sln | 6 +++--- ZRCola/ZRCola.vcxproj | 18 +++++++++--------- ZRColaCompile/ZRColaCompile.vcxproj | 10 +++++----- ZRColaInstall/ZRColaInstallDe.vcxproj | 6 +++--- ZRColaInstall/ZRColaInstallEn.vcxproj | 6 +++--- ZRColaInstall/ZRColaInstallRu.vcxproj | 6 +++--- ZRColaInstall/ZRColaInstallSl.vcxproj | 6 +++--- ZRColaUtils.sln | 6 +++--- lib/WinStd | 2 +- lib/libZRCola/build/libZRCola.vcxproj | 14 +++++++------- lib/libZRColaUI/build/libZRColaUI.vcxproj | 14 +++++++------- lib/stdex | 2 +- lib/wxExtend | 2 +- 15 files changed, 51 insertions(+), 51 deletions(-) diff --git a/MSI/MSICA b/MSI/MSICA index 7ca8b9e..c42ea05 160000 --- a/MSI/MSICA +++ b/MSI/MSICA @@ -1 +1 @@ -Subproject commit 7ca8b9e7c9fddd3a26af698c8679d6fc8034f0df +Subproject commit c42ea05547aad98a67484c691a5b8c7ef8a8d1d0 diff --git a/Updater b/Updater index 6fbcede..5ae6dd5 160000 --- a/Updater +++ b/Updater @@ -1 +1 @@ -Subproject commit 6fbcede83b225df69446ebfcabe16a8513a14fa1 +Subproject commit 5ae6dd56c26ef749e328addd3fdb5e487cea9d43 diff --git a/ZRCola.sln b/ZRCola.sln index 4fb0837..e54b6ae 100644 --- a/ZRCola.sln +++ b/ZRCola.sln @@ -7,7 +7,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZRCola", "ZRCola\ZRCola.vcx EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{6D85AD6A-69D6-40EB-BF0C-7495479DDCE5}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "lib\wxExtend\build\wxExtendLib-15.0.vcxproj", "{D3E29951-D9F5-486D-A167-20AE8E90B1FA}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "lib\wxExtend\build\wxExtendLib-16.0.vcxproj", "{D3E29951-D9F5-486D-A167-20AE8E90B1FA}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{CFEBC17E-C840-4507-BDE6-1EF5B52DDCC5}" ProjectSection(SolutionItems) = preProject @@ -18,11 +18,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libZRCola", "lib\libZRCola\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libZRColaUI", "lib\libZRColaUI\build\libZRColaUI.vcxproj", "{C0A84BD2-3870-4CD6-B281-0AB322E3C579}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stdex", "lib\stdex\build\stdex-15.0.vcxproj", "{518777CC-0A59-4415-A12A-82751ED75343}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stdex", "lib\stdex\build\stdex-16.0.vcxproj", "{518777CC-0A59-4415-A12A-82751ED75343}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Updater", "Updater\Updater\build\Updater.vcxproj", "{990D8CF9-4457-4DC0-AA18-4968EF434741}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinStd", "lib\WinStd\build\WinStd-15.0.vcxproj", "{47399D91-7EB9-41DE-B521-514BA5DB0C43}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinStd", "lib\WinStd\build\WinStd-16.0.vcxproj", "{47399D91-7EB9-41DE-B521-514BA5DB0C43}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/ZRCola/ZRCola.vcxproj b/ZRCola/ZRCola.vcxproj index c2d8aaf..0a4b730 100644 --- a/ZRCola/ZRCola.vcxproj +++ b/ZRCola/ZRCola.vcxproj @@ -29,26 +29,26 @@ {CD9E4170-92DD-440E-980C-D15F62032249} ZRCola - 10.0.17134.0 + 10.0 Application true Unicode - v141 + v142 Application true Unicode - v141 + v142 Application true Unicode - v141 + v142 true @@ -56,21 +56,21 @@ false true Unicode - v141 + v142 Application false true Unicode - v141 + v142 Application false true Unicode - v141 + v142 true @@ -159,10 +159,10 @@ {3c61929e-7289-4101-8d0a-da22d6e1aea8} - + {47399d91-7eb9-41de-b521-514ba5db0c43} - + {D3E29951-D9F5-486D-A167-20AE8E90B1FA} diff --git a/ZRColaCompile/ZRColaCompile.vcxproj b/ZRColaCompile/ZRColaCompile.vcxproj index 2ae2915..460bec7 100644 --- a/ZRColaCompile/ZRColaCompile.vcxproj +++ b/ZRColaCompile/ZRColaCompile.vcxproj @@ -13,21 +13,21 @@ {87A3ADEC-1BE4-42E4-92B8-B742F3D21BC4} ZRColaCompile - 10.0.17134.0 + 10.0 Application true Unicode - v141 + v142 Application false true Unicode - v141 + v142 @@ -66,10 +66,10 @@ {3c61929e-7289-4101-8d0a-da22d6e1aea8} - + {47399d91-7eb9-41de-b521-514ba5db0c43} - + {D3E29951-D9F5-486D-A167-20AE8E90B1FA} diff --git a/ZRColaInstall/ZRColaInstallDe.vcxproj b/ZRColaInstall/ZRColaInstallDe.vcxproj index 0337e2f..77020c9 100644 --- a/ZRColaInstall/ZRColaInstallDe.vcxproj +++ b/ZRColaInstall/ZRColaInstallDe.vcxproj @@ -14,21 +14,21 @@ {620D6AC0-C8FF-4185-B820-DB1503ACB95C} Win32Proj ZRColaInstallDe - 10.0.17134.0 + 10.0 Application true Unicode - v141 + v142 Application false true Unicode - v141 + v142 diff --git a/ZRColaInstall/ZRColaInstallEn.vcxproj b/ZRColaInstall/ZRColaInstallEn.vcxproj index 9ba9271..584464e 100644 --- a/ZRColaInstall/ZRColaInstallEn.vcxproj +++ b/ZRColaInstall/ZRColaInstallEn.vcxproj @@ -14,21 +14,21 @@ {5BD95B95-38B0-4C7D-9471-F99CA1203DF4} Win32Proj ZRColaInstallEn - 10.0.17134.0 + 10.0 Application true Unicode - v141 + v142 Application false true Unicode - v141 + v142 diff --git a/ZRColaInstall/ZRColaInstallRu.vcxproj b/ZRColaInstall/ZRColaInstallRu.vcxproj index 88ece33..92b036e 100644 --- a/ZRColaInstall/ZRColaInstallRu.vcxproj +++ b/ZRColaInstall/ZRColaInstallRu.vcxproj @@ -14,21 +14,21 @@ {2551B561-5E5B-497E-AE01-11519F91EF19} Win32Proj ZRColaInstallRu - 10.0.17134.0 + 10.0 Application true Unicode - v141 + v142 Application false true Unicode - v141 + v142 diff --git a/ZRColaInstall/ZRColaInstallSl.vcxproj b/ZRColaInstall/ZRColaInstallSl.vcxproj index 61f3c3e..4f240b9 100644 --- a/ZRColaInstall/ZRColaInstallSl.vcxproj +++ b/ZRColaInstall/ZRColaInstallSl.vcxproj @@ -14,21 +14,21 @@ {0C2C89C2-C96B-41B6-AA99-7E7741E20F3A} Win32Proj ZRColaInstallSl - 10.0.17134.0 + 10.0 Application true Unicode - v141 + v142 Application false true Unicode - v141 + v142 diff --git a/ZRColaUtils.sln b/ZRColaUtils.sln index b0a3ecb..9c41b9d 100644 --- a/ZRColaUtils.sln +++ b/ZRColaUtils.sln @@ -14,9 +14,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZRColaCompile", "ZRColaCompile\ZRColaCompile.vcxproj", "{87A3ADEC-1BE4-42E4-92B8-B742F3D21BC4}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "lib\wxExtend\build\wxExtendLib-15.0.vcxproj", "{D3E29951-D9F5-486D-A167-20AE8E90B1FA}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "lib\wxExtend\build\wxExtendLib-16.0.vcxproj", "{D3E29951-D9F5-486D-A167-20AE8E90B1FA}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stdex", "lib\stdex\build\stdex-15.0.vcxproj", "{518777CC-0A59-4415-A12A-82751ED75343}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stdex", "lib\stdex\build\stdex-16.0.vcxproj", "{518777CC-0A59-4415-A12A-82751ED75343}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libZRColaUI", "lib\libZRColaUI\build\libZRColaUI.vcxproj", "{C0A84BD2-3870-4CD6-B281-0AB322E3C579}" EndProject @@ -30,7 +30,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZRColaInstallEn", "ZRColaIn EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZRColaInstallRu", "ZRColaInstall\ZRColaInstallRu.vcxproj", "{2551B561-5E5B-497E-AE01-11519F91EF19}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinStd", "lib\WinStd\build\WinStd-15.0.vcxproj", "{47399D91-7EB9-41DE-B521-514BA5DB0C43}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinStd", "lib\WinStd\build\WinStd-16.0.vcxproj", "{47399D91-7EB9-41DE-B521-514BA5DB0C43}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/lib/WinStd b/lib/WinStd index f47faea..8654f36 160000 --- a/lib/WinStd +++ b/lib/WinStd @@ -1 +1 @@ -Subproject commit f47faea71bd5f0dec9b549a6ebd6f5a711b805c8 +Subproject commit 8654f36e2016bc27d7a30b1b914edd9b5d1a3019 diff --git a/lib/libZRCola/build/libZRCola.vcxproj b/lib/libZRCola/build/libZRCola.vcxproj index e497c90..b1507dc 100644 --- a/lib/libZRCola/build/libZRCola.vcxproj +++ b/lib/libZRCola/build/libZRCola.vcxproj @@ -53,26 +53,26 @@ {3C61929E-7289-4101-8D0A-DA22D6E1AEA8} libZRCola - 10.0.17134.0 + 10.0 StaticLibrary true Unicode - v141 + v142 StaticLibrary true Unicode - v141 + v142 StaticLibrary true Unicode - v141 + v142 true @@ -80,21 +80,21 @@ false true Unicode - v141 + v142 StaticLibrary false true Unicode - v141 + v142 StaticLibrary false true Unicode - v141 + v142 true diff --git a/lib/libZRColaUI/build/libZRColaUI.vcxproj b/lib/libZRColaUI/build/libZRColaUI.vcxproj index 6c841b5..3445a5b 100644 --- a/lib/libZRColaUI/build/libZRColaUI.vcxproj +++ b/lib/libZRColaUI/build/libZRColaUI.vcxproj @@ -54,26 +54,26 @@ {C0A84BD2-3870-4CD6-B281-0AB322E3C579} libZRColaUI - 10.0.17134.0 + 10.0 StaticLibrary true Unicode - v141 + v142 StaticLibrary true Unicode - v141 + v142 StaticLibrary true Unicode - v141 + v142 true @@ -81,21 +81,21 @@ false true Unicode - v141 + v142 StaticLibrary false true Unicode - v141 + v142 StaticLibrary false true Unicode - v141 + v142 true diff --git a/lib/stdex b/lib/stdex index 7d1ba8c..50cdbee 160000 --- a/lib/stdex +++ b/lib/stdex @@ -1 +1 @@ -Subproject commit 7d1ba8c1d13a7c383a5befa24e70ff746e2b3c42 +Subproject commit 50cdbee3aea9928df1b3afa476f0c20b90aee34c diff --git a/lib/wxExtend b/lib/wxExtend index 5905beb..306e91b 160000 --- a/lib/wxExtend +++ b/lib/wxExtend @@ -1 +1 @@ -Subproject commit 5905beb49b14d351a04246776ff417bd2d702a4e +Subproject commit 306e91b3f617f3d755185ff0b5b391988a3817a7