diff options
author | George Hazan <ghazan@miranda.im> | 2022-10-01 17:15:47 +0300 |
---|---|---|
committer | George Hazan <ghazan@miranda.im> | 2022-10-01 17:15:47 +0300 |
commit | 4be5a11d0b125c1444400cf348613eb54ac4df28 (patch) | |
tree | f82cb5a92bbee02294d3f3ef36f3b33410a91bb8 | |
parent | dbb1f345ffde5dd13046fbfc5b2fa7643029a5c8 (diff) |
WhatsApp added to mir_full solutions
-rw-r--r-- | bin15/mir_full.sln | 22 | ||||
-rw-r--r-- | bin16/mir_full.sln | 22 | ||||
-rw-r--r-- | bin17/mir_full.sln | 22 | ||||
-rw-r--r-- | protocols/WhatsAppWeb/WhatsAppWeb.vcxproj | 8 | ||||
-rw-r--r-- | protocols/WhatsAppWeb/src/stdafx.h | 6 |
5 files changed, 73 insertions, 7 deletions
diff --git a/bin15/mir_full.sln b/bin15/mir_full.sln index 0f12d929a5..a2d6d45a18 100644 --- a/bin15/mir_full.sln +++ b/bin15/mir_full.sln @@ -444,6 +444,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmdbx", "..\libs\libmdbx\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VoiceService", "..\plugins\VoiceService\VoiceService.vcxproj", "{48A76FF0-9506-4D70-81D7-E3A2B2B2A65A}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libqrencode", "..\libs\libqrencode\libqrencode.vcxproj", "{4D3554DE-6E14-4F94-A909-A4B19151A47E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WhatsAppWeb", "..\protocols\WhatsAppWeb\WhatsAppWeb.vcxproj", "{13E796AD-BEA4-4213-A1B8-E18E2397E544}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -2010,6 +2014,22 @@ Global {48A76FF0-9506-4D70-81D7-E3A2B2B2A65A}.Release|Win32.Build.0 = Release|Win32 {48A76FF0-9506-4D70-81D7-E3A2B2B2A65A}.Release|x64.ActiveCfg = Release|x64 {48A76FF0-9506-4D70-81D7-E3A2B2B2A65A}.Release|x64.Build.0 = Release|x64 + {4D3554DE-6E14-4F94-A909-A4B19151A47E}.Debug|Win32.ActiveCfg = Debug|Win32 + {4D3554DE-6E14-4F94-A909-A4B19151A47E}.Debug|Win32.Build.0 = Debug|Win32 + {4D3554DE-6E14-4F94-A909-A4B19151A47E}.Debug|x64.ActiveCfg = Debug|x64 + {4D3554DE-6E14-4F94-A909-A4B19151A47E}.Debug|x64.Build.0 = Debug|x64 + {4D3554DE-6E14-4F94-A909-A4B19151A47E}.Release|Win32.ActiveCfg = Release|Win32 + {4D3554DE-6E14-4F94-A909-A4B19151A47E}.Release|Win32.Build.0 = Release|Win32 + {4D3554DE-6E14-4F94-A909-A4B19151A47E}.Release|x64.ActiveCfg = Release|x64 + {4D3554DE-6E14-4F94-A909-A4B19151A47E}.Release|x64.Build.0 = Release|x64 + {13E796AD-BEA4-4213-A1B8-E18E2397E544}.Debug|Win32.ActiveCfg = Debug|Win32 + {13E796AD-BEA4-4213-A1B8-E18E2397E544}.Debug|Win32.Build.0 = Debug|Win32 + {13E796AD-BEA4-4213-A1B8-E18E2397E544}.Debug|x64.ActiveCfg = Debug|x64 + {13E796AD-BEA4-4213-A1B8-E18E2397E544}.Debug|x64.Build.0 = Debug|x64 + {13E796AD-BEA4-4213-A1B8-E18E2397E544}.Release|Win32.ActiveCfg = Release|Win32 + {13E796AD-BEA4-4213-A1B8-E18E2397E544}.Release|Win32.Build.0 = Release|Win32 + {13E796AD-BEA4-4213-A1B8-E18E2397E544}.Release|x64.ActiveCfg = Release|x64 + {13E796AD-BEA4-4213-A1B8-E18E2397E544}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -2138,6 +2158,8 @@ Global {A2E9DA24-95E4-4414-94AF-488A382E276A} = {F13387B0-1C74-48EC-9AEC-65E3B9DE29E4} {6D19209B-ECE7-4B9C-941C-0AA2B484F199} = {37EDFBEA-8446-4BF3-9F2E-655908CDFB62} {48A76FF0-9506-4D70-81D7-E3A2B2B2A65A} = {F9C41695-3353-4564-A154-58106829B19C} + {4D3554DE-6E14-4F94-A909-A4B19151A47E} = {37EDFBEA-8446-4BF3-9F2E-655908CDFB62} + {13E796AD-BEA4-4213-A1B8-E18E2397E544} = {A035B524-0F2D-45D0-BCF2-3C20279C77E2} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {29A0C2A8-07A4-4A8B-8BED-8F7D024013D6} diff --git a/bin16/mir_full.sln b/bin16/mir_full.sln index dcc98ee0ae..75d24832fa 100644 --- a/bin16/mir_full.sln +++ b/bin16/mir_full.sln @@ -444,6 +444,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmdbx", "..\libs\libmdbx\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VoiceService", "..\plugins\VoiceService\VoiceService.vcxproj", "{48A76FF0-9506-4D70-81D7-E3A2B2B2A65A}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libqrencode", "..\libs\libqrencode\libqrencode.vcxproj", "{4D3554DE-6E14-4F94-A909-A4B19151A47E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WhatsAppWeb", "..\protocols\WhatsAppWeb\WhatsAppWeb.vcxproj", "{13E796AD-BEA4-4213-A1B8-E18E2397E544}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -2010,6 +2014,22 @@ Global {48A76FF0-9506-4D70-81D7-E3A2B2B2A65A}.Release|Win32.Build.0 = Release|Win32 {48A76FF0-9506-4D70-81D7-E3A2B2B2A65A}.Release|x64.ActiveCfg = Release|x64 {48A76FF0-9506-4D70-81D7-E3A2B2B2A65A}.Release|x64.Build.0 = Release|x64 + {4D3554DE-6E14-4F94-A909-A4B19151A47E}.Debug|Win32.ActiveCfg = Debug|Win32 + {4D3554DE-6E14-4F94-A909-A4B19151A47E}.Debug|Win32.Build.0 = Debug|Win32 + {4D3554DE-6E14-4F94-A909-A4B19151A47E}.Debug|x64.ActiveCfg = Debug|x64 + {4D3554DE-6E14-4F94-A909-A4B19151A47E}.Debug|x64.Build.0 = Debug|x64 + {4D3554DE-6E14-4F94-A909-A4B19151A47E}.Release|Win32.ActiveCfg = Release|Win32 + {4D3554DE-6E14-4F94-A909-A4B19151A47E}.Release|Win32.Build.0 = Release|Win32 + {4D3554DE-6E14-4F94-A909-A4B19151A47E}.Release|x64.ActiveCfg = Release|x64 + {4D3554DE-6E14-4F94-A909-A4B19151A47E}.Release|x64.Build.0 = Release|x64 + {13E796AD-BEA4-4213-A1B8-E18E2397E544}.Debug|Win32.ActiveCfg = Debug|Win32 + {13E796AD-BEA4-4213-A1B8-E18E2397E544}.Debug|Win32.Build.0 = Debug|Win32 + {13E796AD-BEA4-4213-A1B8-E18E2397E544}.Debug|x64.ActiveCfg = Debug|x64 + {13E796AD-BEA4-4213-A1B8-E18E2397E544}.Debug|x64.Build.0 = Debug|x64 + {13E796AD-BEA4-4213-A1B8-E18E2397E544}.Release|Win32.ActiveCfg = Release|Win32 + {13E796AD-BEA4-4213-A1B8-E18E2397E544}.Release|Win32.Build.0 = Release|Win32 + {13E796AD-BEA4-4213-A1B8-E18E2397E544}.Release|x64.ActiveCfg = Release|x64 + {13E796AD-BEA4-4213-A1B8-E18E2397E544}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -2138,6 +2158,8 @@ Global {A2E9DA24-95E4-4414-94AF-488A382E276A} = {F13387B0-1C74-48EC-9AEC-65E3B9DE29E4} {6D19209B-ECE7-4B9C-941C-0AA2B484F199} = {37EDFBEA-8446-4BF3-9F2E-655908CDFB62} {48A76FF0-9506-4D70-81D7-E3A2B2B2A65A} = {F9C41695-3353-4564-A154-58106829B19C} + {4D3554DE-6E14-4F94-A909-A4B19151A47E} = {37EDFBEA-8446-4BF3-9F2E-655908CDFB62} + {13E796AD-BEA4-4213-A1B8-E18E2397E544} = {A035B524-0F2D-45D0-BCF2-3C20279C77E2} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {29A0C2A8-07A4-4A8B-8BED-8F7D024013D6} diff --git a/bin17/mir_full.sln b/bin17/mir_full.sln index 60c23caae7..fce1e55825 100644 --- a/bin17/mir_full.sln +++ b/bin17/mir_full.sln @@ -444,6 +444,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pthreads", "..\libs\pthread EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VoiceService", "..\plugins\VoiceService\VoiceService.vcxproj", "{48A76FF0-9506-4D70-81D7-E3A2B2B2A65A}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libqrencode", "..\libs\libqrencode\libqrencode.vcxproj", "{4D3554DE-6E14-4F94-A909-A4B19151A47E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WhatsAppWeb", "..\protocols\WhatsAppWeb\WhatsAppWeb.vcxproj", "{13E796AD-BEA4-4213-A1B8-E18E2397E544}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -2010,6 +2014,22 @@ Global {48A76FF0-9506-4D70-81D7-E3A2B2B2A65A}.Release|Win32.Build.0 = Release|Win32 {48A76FF0-9506-4D70-81D7-E3A2B2B2A65A}.Release|x64.ActiveCfg = Release|x64 {48A76FF0-9506-4D70-81D7-E3A2B2B2A65A}.Release|x64.Build.0 = Release|x64 + {4D3554DE-6E14-4F94-A909-A4B19151A47E}.Debug|Win32.ActiveCfg = Debug|Win32 + {4D3554DE-6E14-4F94-A909-A4B19151A47E}.Debug|Win32.Build.0 = Debug|Win32 + {4D3554DE-6E14-4F94-A909-A4B19151A47E}.Debug|x64.ActiveCfg = Debug|x64 + {4D3554DE-6E14-4F94-A909-A4B19151A47E}.Debug|x64.Build.0 = Debug|x64 + {4D3554DE-6E14-4F94-A909-A4B19151A47E}.Release|Win32.ActiveCfg = Release|Win32 + {4D3554DE-6E14-4F94-A909-A4B19151A47E}.Release|Win32.Build.0 = Release|Win32 + {4D3554DE-6E14-4F94-A909-A4B19151A47E}.Release|x64.ActiveCfg = Release|x64 + {4D3554DE-6E14-4F94-A909-A4B19151A47E}.Release|x64.Build.0 = Release|x64 + {13E796AD-BEA4-4213-A1B8-E18E2397E544}.Debug|Win32.ActiveCfg = Debug|Win32 + {13E796AD-BEA4-4213-A1B8-E18E2397E544}.Debug|Win32.Build.0 = Debug|Win32 + {13E796AD-BEA4-4213-A1B8-E18E2397E544}.Debug|x64.ActiveCfg = Debug|x64 + {13E796AD-BEA4-4213-A1B8-E18E2397E544}.Debug|x64.Build.0 = Debug|x64 + {13E796AD-BEA4-4213-A1B8-E18E2397E544}.Release|Win32.ActiveCfg = Release|Win32 + {13E796AD-BEA4-4213-A1B8-E18E2397E544}.Release|Win32.Build.0 = Release|Win32 + {13E796AD-BEA4-4213-A1B8-E18E2397E544}.Release|x64.ActiveCfg = Release|x64 + {13E796AD-BEA4-4213-A1B8-E18E2397E544}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -2138,6 +2158,8 @@ Global {6D19209B-ECE7-4B9C-941C-0AA2B484F199} = {37EDFBEA-8446-4BF3-9F2E-655908CDFB62} {E0EBB8A5-B577-414C-A5F9-9B4E2A0A66E9} = {37EDFBEA-8446-4BF3-9F2E-655908CDFB62} {48A76FF0-9506-4D70-81D7-E3A2B2B2A65A} = {F9C41695-3353-4564-A154-58106829B19C} + {4D3554DE-6E14-4F94-A909-A4B19151A47E} = {37EDFBEA-8446-4BF3-9F2E-655908CDFB62} + {13E796AD-BEA4-4213-A1B8-E18E2397E544} = {A035B524-0F2D-45D0-BCF2-3C20279C77E2} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {29A0C2A8-07A4-4A8B-8BED-8F7D024013D6} diff --git a/protocols/WhatsAppWeb/WhatsAppWeb.vcxproj b/protocols/WhatsAppWeb/WhatsAppWeb.vcxproj index da5fc7e34f..4929d9f266 100644 --- a/protocols/WhatsAppWeb/WhatsAppWeb.vcxproj +++ b/protocols/WhatsAppWeb/WhatsAppWeb.vcxproj @@ -37,13 +37,13 @@ <ProjectName>WhatsAppWeb</ProjectName> </PropertyGroup> <PropertyGroup Label="Vcpkg" Condition="'$(Platform)'=='Win32'"> - <VcpkgUseStatic>true</VcpkgUseStatic> - <VcpkgTriplet>x86-windows-static-md</VcpkgTriplet> + <VcpkgUseStatic>false</VcpkgUseStatic> + <VcpkgTriplet>x86-windows</VcpkgTriplet> <VcpkgConfiguration>$(Configuration)</VcpkgConfiguration> </PropertyGroup> <PropertyGroup Label="Vcpkg" Condition="'$(Platform)'=='x64'"> - <VcpkgUseStatic>true</VcpkgUseStatic> - <VcpkgTriplet>x64-windows-static-md</VcpkgTriplet> + <VcpkgUseStatic>false</VcpkgUseStatic> + <VcpkgTriplet>x64-windows</VcpkgTriplet> <VcpkgConfiguration>$(Configuration)</VcpkgConfiguration> </PropertyGroup> <ImportGroup Label="PropertySheets"> diff --git a/protocols/WhatsAppWeb/src/stdafx.h b/protocols/WhatsAppWeb/src/stdafx.h index 3daa665b0f..c0e160cc2d 100644 --- a/protocols/WhatsAppWeb/src/stdafx.h +++ b/protocols/WhatsAppWeb/src/stdafx.h @@ -64,9 +64,9 @@ Copyright © 2019-22 George Hazan // - install vcpkg (https://github.com/microsoft/vcpkg); // - integrage vcpkg into Visual Studio: // >vcpkg.exe integrate install -// - install static libraries of protobuf: -// >vcpkg.exe install protobuf:x86-windows-static-md -// >vcpkg.exe install protobuf:x64-windows-static-md +// - install dynamic libraries of protobuf: +// >vcpkg.exe install protobuf:x86-windows +// >vcpkg.exe install protobuf:x64-windows #include "google/protobuf/message.h" #include "pmsg.pb.h" |