From 7a387ced9bd2b67f8c98af85cb4cf3b7230c32a0 Mon Sep 17 00:00:00 2001 From: dartraiden Date: Thu, 2 May 2024 21:18:34 +0300 Subject: Unify solutions --- bin15/mir_full.sln | 2 +- bin17/mir_full.sln | 42 +++++++++++++++++++++--------------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/bin15/mir_full.sln b/bin15/mir_full.sln index d5b02deddf..4d5d0c4b48 100644 --- a/bin15/mir_full.sln +++ b/bin15/mir_full.sln @@ -1508,7 +1508,7 @@ Global {0E046380-14CA-4C23-A807-8C678519A605}.Debug|x64.ActiveCfg = Debug|Win32 {0E046380-14CA-4C23-A807-8C678519A605}.Release|Win32.ActiveCfg = Release|Win32 {0E046380-14CA-4C23-A807-8C678519A605}.Release|Win32.Build.0 = Release|Win32 - {0E046380-14CA-4C23-A807-8C678519A605}.Release|x64.ActiveCfg = Release|x64 + {0E046380-14CA-4C23-A807-8C678519A605}.Release|x64.ActiveCfg = Release|Win32 {3E9DA555-4C7B-463C-AD5C-214073DE29D6}.Debug|Win32.ActiveCfg = Debug|Win32 {3E9DA555-4C7B-463C-AD5C-214073DE29D6}.Debug|Win32.Build.0 = Debug|Win32 {3E9DA555-4C7B-463C-AD5C-214073DE29D6}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/bin17/mir_full.sln b/bin17/mir_full.sln index 3160e25635..30f620d7b3 100644 --- a/bin17/mir_full.sln +++ b/bin17/mir_full.sln @@ -297,6 +297,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Spamotron", "..\plugins\Spa EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LotusNotify", "..\protocols\LotusNotify\LotusNotify.vcxproj", "{0E046380-14CA-4C23-A807-8C678519A605}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MirFox", "..\plugins\MirFox\MirFoxNG_17.vcxproj", "{3E9DA555-4C7B-463C-AD5C-214073DE29D6}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ConnectionNotify", "..\protocols\ConnectionNotify\ConnectionNotify.vcxproj", "{3C83B0AB-9739-41C1-A127-ED7DB9551F76}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Exchange", "..\plugins\Exchange\Exchange.vcxproj", "{F462FDA1-BDCD-49B2-B996-D7DE71D07393}" @@ -373,6 +375,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "..\libs\sqlite3\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsodium", "..\libs\libsodium\libsodium.vcxproj", "{A185B162-6CB6-4502-B03F-B56F7699A8D9}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pthreads", "..\libs\pthreads\pthreads.vcxproj", "{E0EBB8A5-B577-414C-A5F9-9B4E2A0A66E9}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtox", "..\protocols\Tox\libtox\libtox.vcxproj", "{A21C50CD-28A6-481A-A12B-47189FE66641}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FileAsMessage", "..\plugins\FileAsMessage\fileecho.vcxproj", "{D7A3B8D0-425A-2286-8E2F-2C0BF1EE5C2E}" @@ -429,10 +433,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QuickSearch", "..\plugins\Q EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmdbx", "..\libs\libmdbx\libmdbx.vcxproj", "{6D19209B-ECE7-4B9C-941C-0AA2B484F199}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MirFox", "..\plugins\MirFox\MirFoxNG_17.vcxproj", "{3E9DA555-4C7B-463C-AD5C-214073DE29D6}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pthreads", "..\libs\pthreads\pthreads.vcxproj", "{E0EBB8A5-B577-414C-A5F9-9B4E2A0A66E9}" -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}" @@ -1509,6 +1509,14 @@ Global {0E046380-14CA-4C23-A807-8C678519A605}.Release|Win32.ActiveCfg = Release|Win32 {0E046380-14CA-4C23-A807-8C678519A605}.Release|Win32.Build.0 = Release|Win32 {0E046380-14CA-4C23-A807-8C678519A605}.Release|x64.ActiveCfg = Release|Win32 + {3E9DA555-4C7B-463C-AD5C-214073DE29D6}.Debug|Win32.ActiveCfg = Debug|Win32 + {3E9DA555-4C7B-463C-AD5C-214073DE29D6}.Debug|Win32.Build.0 = Debug|Win32 + {3E9DA555-4C7B-463C-AD5C-214073DE29D6}.Debug|x64.ActiveCfg = Debug|x64 + {3E9DA555-4C7B-463C-AD5C-214073DE29D6}.Debug|x64.Build.0 = Debug|x64 + {3E9DA555-4C7B-463C-AD5C-214073DE29D6}.Release|Win32.ActiveCfg = Release|Win32 + {3E9DA555-4C7B-463C-AD5C-214073DE29D6}.Release|Win32.Build.0 = Release|Win32 + {3E9DA555-4C7B-463C-AD5C-214073DE29D6}.Release|x64.ActiveCfg = Release|x64 + {3E9DA555-4C7B-463C-AD5C-214073DE29D6}.Release|x64.Build.0 = Release|x64 {3C83B0AB-9739-41C1-A127-ED7DB9551F76}.Debug|Win32.ActiveCfg = Debug|Win32 {3C83B0AB-9739-41C1-A127-ED7DB9551F76}.Debug|Win32.Build.0 = Debug|Win32 {3C83B0AB-9739-41C1-A127-ED7DB9551F76}.Debug|x64.ActiveCfg = Debug|x64 @@ -1813,6 +1821,14 @@ Global {A185B162-6CB6-4502-B03F-B56F7699A8D9}.Release|Win32.Build.0 = Release|Win32 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.Release|x64.ActiveCfg = Release|x64 {A185B162-6CB6-4502-B03F-B56F7699A8D9}.Release|x64.Build.0 = Release|x64 + {E0EBB8A5-B577-414C-A5F9-9B4E2A0A66E9}.Debug|Win32.ActiveCfg = Debug|Win32 + {E0EBB8A5-B577-414C-A5F9-9B4E2A0A66E9}.Debug|Win32.Build.0 = Debug|Win32 + {E0EBB8A5-B577-414C-A5F9-9B4E2A0A66E9}.Debug|x64.ActiveCfg = Debug|x64 + {E0EBB8A5-B577-414C-A5F9-9B4E2A0A66E9}.Debug|x64.Build.0 = Debug|x64 + {E0EBB8A5-B577-414C-A5F9-9B4E2A0A66E9}.Release|Win32.ActiveCfg = Release|Win32 + {E0EBB8A5-B577-414C-A5F9-9B4E2A0A66E9}.Release|Win32.Build.0 = Release|Win32 + {E0EBB8A5-B577-414C-A5F9-9B4E2A0A66E9}.Release|x64.ActiveCfg = Release|x64 + {E0EBB8A5-B577-414C-A5F9-9B4E2A0A66E9}.Release|x64.Build.0 = Release|x64 {A21C50CD-28A6-481A-A12B-47189FE66641}.Debug|Win32.ActiveCfg = Debug|Win32 {A21C50CD-28A6-481A-A12B-47189FE66641}.Debug|Win32.Build.0 = Debug|Win32 {A21C50CD-28A6-481A-A12B-47189FE66641}.Debug|x64.ActiveCfg = Debug|x64 @@ -1965,22 +1981,6 @@ Global {6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Release|Win32.Build.0 = Release|Win32 {6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Release|x64.ActiveCfg = Release|x64 {6D19209B-ECE7-4B9C-941C-0AA2B484F199}.Release|x64.Build.0 = Release|x64 - {3E9DA555-4C7B-463C-AD5C-214073DE29D6}.Debug|Win32.ActiveCfg = Debug|Win32 - {3E9DA555-4C7B-463C-AD5C-214073DE29D6}.Debug|Win32.Build.0 = Debug|Win32 - {3E9DA555-4C7B-463C-AD5C-214073DE29D6}.Debug|x64.ActiveCfg = Debug|x64 - {3E9DA555-4C7B-463C-AD5C-214073DE29D6}.Debug|x64.Build.0 = Debug|x64 - {3E9DA555-4C7B-463C-AD5C-214073DE29D6}.Release|Win32.ActiveCfg = Release|Win32 - {3E9DA555-4C7B-463C-AD5C-214073DE29D6}.Release|Win32.Build.0 = Release|Win32 - {3E9DA555-4C7B-463C-AD5C-214073DE29D6}.Release|x64.ActiveCfg = Release|x64 - {3E9DA555-4C7B-463C-AD5C-214073DE29D6}.Release|x64.Build.0 = Release|x64 - {E0EBB8A5-B577-414C-A5F9-9B4E2A0A66E9}.Debug|Win32.ActiveCfg = Debug|Win32 - {E0EBB8A5-B577-414C-A5F9-9B4E2A0A66E9}.Debug|Win32.Build.0 = Debug|Win32 - {E0EBB8A5-B577-414C-A5F9-9B4E2A0A66E9}.Debug|x64.ActiveCfg = Debug|x64 - {E0EBB8A5-B577-414C-A5F9-9B4E2A0A66E9}.Debug|x64.Build.0 = Debug|x64 - {E0EBB8A5-B577-414C-A5F9-9B4E2A0A66E9}.Release|Win32.ActiveCfg = Release|Win32 - {E0EBB8A5-B577-414C-A5F9-9B4E2A0A66E9}.Release|Win32.Build.0 = Release|Win32 - {E0EBB8A5-B577-414C-A5F9-9B4E2A0A66E9}.Release|x64.ActiveCfg = Release|x64 - {E0EBB8A5-B577-414C-A5F9-9B4E2A0A66E9}.Release|x64.Build.0 = Release|x64 {48A76FF0-9506-4D70-81D7-E3A2B2B2A65A}.Debug|Win32.ActiveCfg = Debug|Win32 {48A76FF0-9506-4D70-81D7-E3A2B2B2A65A}.Debug|Win32.Build.0 = Debug|Win32 {48A76FF0-9506-4D70-81D7-E3A2B2B2A65A}.Debug|x64.ActiveCfg = Debug|x64 @@ -2145,6 +2145,7 @@ Global {CE6A5A24-EA88-4E67-BDF2-22517528E43F} = {F9C41695-3353-4564-A154-58106829B19C} {0C02E395-E73F-47E3-8B95-B7924C0C7A6A} = {37EDFBEA-8446-4BF3-9F2E-655908CDFB62} {A185B162-6CB6-4502-B03F-B56F7699A8D9} = {37EDFBEA-8446-4BF3-9F2E-655908CDFB62} + {E0EBB8A5-B577-414C-A5F9-9B4E2A0A66E9} = {37EDFBEA-8446-4BF3-9F2E-655908CDFB62} {A21C50CD-28A6-481A-A12B-47189FE66641} = {37EDFBEA-8446-4BF3-9F2E-655908CDFB62} {2115FEBC-1EC4-4F95-A058-A523ED5295A4} = {A035B524-0F2D-45D0-BCF2-3C20279C77E2} {E0ACDEA0-0AC9-4431-8CA3-6B0CCACB2E18} = {F13387B0-1C74-48EC-9AEC-65E3B9DE29E4} @@ -2160,7 +2161,6 @@ Global {A7FAD273-8C71-4D72-A84F-2D160F2DC589} = {D8EA3AE1-64AA-42ED-9F13-83F6C7B5AA55} {A2E9DA24-95E4-4414-94AF-488A382E276A} = {F13387B0-1C74-48EC-9AEC-65E3B9DE29E4} {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} -- cgit v1.2.3