too lazy to rebuld Discord each time... let it be uploaded with the dev build

9 files changed, 68 insertions, 0 deletions

diff --git a/bin15/mir_full.sln b/bin15/mir_full.sln
index 0d326a89e2..d15a14a42a 100644
--- a/bin15/mir_full.sln
+++ b/bin15/mir_full.sln
@@ -443,6 +443,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Telegram", "..\protocols\Te
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Jingle", "..\plugins\Jingle\Jingle.vcxproj", "{D3E24A92-E2C3-440F-BC87-002AB822ABFB}"

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Discord", "..\protocols\Discord\discord.vcxproj", "{88928401-2CE8-4568-AAA7-226141870CBF}"

+EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Win32 = Debug|Win32

@@ -2017,6 +2019,14 @@ Global
 		{D3E24A92-E2C3-440F-BC87-002AB822ABFB}.Release|Win32.Build.0 = Release|Win32

 		{D3E24A92-E2C3-440F-BC87-002AB822ABFB}.Release|x64.ActiveCfg = Release|x64

 		{D3E24A92-E2C3-440F-BC87-002AB822ABFB}.Release|x64.Build.0 = Release|x64

+		{88928401-2CE8-4568-AAA7-226141870CBF}.Debug|Win32.ActiveCfg = Debug|Win32

+		{88928401-2CE8-4568-AAA7-226141870CBF}.Debug|Win32.Build.0 = Debug|Win32

+		{88928401-2CE8-4568-AAA7-226141870CBF}.Debug|x64.ActiveCfg = Debug|x64

+		{88928401-2CE8-4568-AAA7-226141870CBF}.Debug|x64.Build.0 = Debug|x64

+		{88928401-2CE8-4568-AAA7-226141870CBF}.Release|Win32.ActiveCfg = Release|Win32

+		{88928401-2CE8-4568-AAA7-226141870CBF}.Release|Win32.Build.0 = Release|Win32

+		{88928401-2CE8-4568-AAA7-226141870CBF}.Release|x64.ActiveCfg = Release|x64

+		{88928401-2CE8-4568-AAA7-226141870CBF}.Release|x64.Build.0 = Release|x64

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

@@ -2146,6 +2156,7 @@ Global
 		{13E796AD-BEA4-4213-A1B8-E18E2397E544} = {A035B524-0F2D-45D0-BCF2-3C20279C77E2}

 		{AE708252-0DF8-42BA-9EF9-9ACC038EEDA7} = {A035B524-0F2D-45D0-BCF2-3C20279C77E2}

 		{D3E24A92-E2C3-440F-BC87-002AB822ABFB} = {A035B524-0F2D-45D0-BCF2-3C20279C77E2}

+		{88928401-2CE8-4568-AAA7-226141870CBF} = {A035B524-0F2D-45D0-BCF2-3C20279C77E2}

 	EndGlobalSection

 	GlobalSection(ExtensibilityGlobals) = postSolution

 		SolutionGuid = {29A0C2A8-07A4-4A8B-8BED-8F7D024013D6}

diff --git a/bin15/mir_icons.sln b/bin15/mir_icons.sln
index 873b85b3aa..db90172c04 100644
--- a/bin15/mir_icons.sln
+++ b/bin15/mir_icons.sln
@@ -62,6 +62,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_WhatsApp", "..\protoc
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Telegram", "..\protocols\Telegram\proto_telegram\Proto_Telegram.vcxproj", "{129A4E61-45E8-E476-BD50-5E03BA80E9AD}"

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Discord", "..\protocols\Discord\proto_discord\Proto_Discord.vcxproj", "{6B8BA5EE-3815-44A6-A13B-2A22E8B3A311}"

+EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Win32 = Debug|Win32

@@ -310,6 +312,14 @@ Global
 		{129A4E61-45E8-E476-BD50-5E03BA80E9AD}.Release|Win32.Build.0 = Release|Win32

 		{129A4E61-45E8-E476-BD50-5E03BA80E9AD}.Release|x64.ActiveCfg = Release|x64

 		{129A4E61-45E8-E476-BD50-5E03BA80E9AD}.Release|x64.Build.0 = Release|x64

+		{6B8BA5EE-3815-44A6-A13B-2A22E8B3A311}.Debug|Win32.ActiveCfg = Debug|Win32

+		{6B8BA5EE-3815-44A6-A13B-2A22E8B3A311}.Debug|Win32.Build.0 = Debug|Win32

+		{6B8BA5EE-3815-44A6-A13B-2A22E8B3A311}.Debug|x64.ActiveCfg = Debug|x64

+		{6B8BA5EE-3815-44A6-A13B-2A22E8B3A311}.Debug|x64.Build.0 = Debug|x64

+		{6B8BA5EE-3815-44A6-A13B-2A22E8B3A311}.Release|Win32.ActiveCfg = Release|Win32

+		{6B8BA5EE-3815-44A6-A13B-2A22E8B3A311}.Release|Win32.Build.0 = Release|Win32

+		{6B8BA5EE-3815-44A6-A13B-2A22E8B3A311}.Release|x64.ActiveCfg = Release|x64

+		{6B8BA5EE-3815-44A6-A13B-2A22E8B3A311}.Release|x64.Build.0 = Release|x64

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/bin16/mir_full.sln b/bin16/mir_full.sln
index 865cb44c89..5ddcce37d1 100644
--- a/bin16/mir_full.sln
+++ b/bin16/mir_full.sln
@@ -443,6 +443,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Telegram", "..\protocols\Te
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Jingle", "..\plugins\Jingle\Jingle.vcxproj", "{D3E24A92-E2C3-440F-BC87-002AB822ABFB}"

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Discord", "..\protocols\Discord\discord.vcxproj", "{88928401-2CE8-4568-AAA7-226141870CBF}"

+EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Win32 = Debug|Win32

@@ -2017,6 +2019,14 @@ Global
 		{D3E24A92-E2C3-440F-BC87-002AB822ABFB}.Release|Win32.Build.0 = Release|Win32

 		{D3E24A92-E2C3-440F-BC87-002AB822ABFB}.Release|x64.ActiveCfg = Release|x64

 		{D3E24A92-E2C3-440F-BC87-002AB822ABFB}.Release|x64.Build.0 = Release|x64

+		{88928401-2CE8-4568-AAA7-226141870CBF}.Debug|Win32.ActiveCfg = Debug|Win32

+		{88928401-2CE8-4568-AAA7-226141870CBF}.Debug|Win32.Build.0 = Debug|Win32

+		{88928401-2CE8-4568-AAA7-226141870CBF}.Debug|x64.ActiveCfg = Debug|x64

+		{88928401-2CE8-4568-AAA7-226141870CBF}.Debug|x64.Build.0 = Debug|x64

+		{88928401-2CE8-4568-AAA7-226141870CBF}.Release|Win32.ActiveCfg = Release|Win32

+		{88928401-2CE8-4568-AAA7-226141870CBF}.Release|Win32.Build.0 = Release|Win32

+		{88928401-2CE8-4568-AAA7-226141870CBF}.Release|x64.ActiveCfg = Release|x64

+		{88928401-2CE8-4568-AAA7-226141870CBF}.Release|x64.Build.0 = Release|x64

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

@@ -2146,6 +2156,7 @@ Global
 		{13E796AD-BEA4-4213-A1B8-E18E2397E544} = {A035B524-0F2D-45D0-BCF2-3C20279C77E2}

 		{AE708252-0DF8-42BA-9EF9-9ACC038EEDA7} = {A035B524-0F2D-45D0-BCF2-3C20279C77E2}

 		{D3E24A92-E2C3-440F-BC87-002AB822ABFB} = {A035B524-0F2D-45D0-BCF2-3C20279C77E2}

+		{88928401-2CE8-4568-AAA7-226141870CBF} = {A035B524-0F2D-45D0-BCF2-3C20279C77E2}

 	EndGlobalSection

 	GlobalSection(ExtensibilityGlobals) = postSolution

 		SolutionGuid = {29A0C2A8-07A4-4A8B-8BED-8F7D024013D6}

diff --git a/bin16/mir_icons.sln b/bin16/mir_icons.sln
index 8e7a14c662..82c0f09b4e 100644
--- a/bin16/mir_icons.sln
+++ b/bin16/mir_icons.sln
@@ -62,6 +62,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_WhatsApp", "..\protoc
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Telegram", "..\protocols\Telegram\proto_telegram\Proto_Telegram.vcxproj", "{129A4E61-45E8-E476-BD50-5E03BA80E9AD}"

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Discord", "..\protocols\Discord\proto_discord\Proto_Discord.vcxproj", "{6B8BA5EE-3815-44A6-A13B-2A22E8B3A311}"

+EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Win32 = Debug|Win32

@@ -310,6 +312,14 @@ Global
 		{129A4E61-45E8-E476-BD50-5E03BA80E9AD}.Release|Win32.Build.0 = Release|Win32

 		{129A4E61-45E8-E476-BD50-5E03BA80E9AD}.Release|x64.ActiveCfg = Release|x64

 		{129A4E61-45E8-E476-BD50-5E03BA80E9AD}.Release|x64.Build.0 = Release|x64

+		{6B8BA5EE-3815-44A6-A13B-2A22E8B3A311}.Debug|Win32.ActiveCfg = Debug|Win32

+		{6B8BA5EE-3815-44A6-A13B-2A22E8B3A311}.Debug|Win32.Build.0 = Debug|Win32

+		{6B8BA5EE-3815-44A6-A13B-2A22E8B3A311}.Debug|x64.ActiveCfg = Debug|x64

+		{6B8BA5EE-3815-44A6-A13B-2A22E8B3A311}.Debug|x64.Build.0 = Debug|x64

+		{6B8BA5EE-3815-44A6-A13B-2A22E8B3A311}.Release|Win32.ActiveCfg = Release|Win32

+		{6B8BA5EE-3815-44A6-A13B-2A22E8B3A311}.Release|Win32.Build.0 = Release|Win32

+		{6B8BA5EE-3815-44A6-A13B-2A22E8B3A311}.Release|x64.ActiveCfg = Release|x64

+		{6B8BA5EE-3815-44A6-A13B-2A22E8B3A311}.Release|x64.Build.0 = Release|x64

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/bin17/mir_full.sln b/bin17/mir_full.sln
index ca608abb64..2a4d71b85f 100644
--- a/bin17/mir_full.sln
+++ b/bin17/mir_full.sln
@@ -443,6 +443,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Telegram", "..\protocols\Te
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Jingle", "..\plugins\Jingle\Jingle.vcxproj", "{D3E24A92-E2C3-440F-BC87-002AB822ABFB}"

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Discord", "..\protocols\Discord\discord.vcxproj", "{88928401-2CE8-4568-AAA7-226141870CBF}"

+EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Win32 = Debug|Win32

@@ -2017,6 +2019,14 @@ Global
 		{D3E24A92-E2C3-440F-BC87-002AB822ABFB}.Release|Win32.Build.0 = Release|Win32

 		{D3E24A92-E2C3-440F-BC87-002AB822ABFB}.Release|x64.ActiveCfg = Release|x64

 		{D3E24A92-E2C3-440F-BC87-002AB822ABFB}.Release|x64.Build.0 = Release|x64

+		{88928401-2CE8-4568-AAA7-226141870CBF}.Debug|Win32.ActiveCfg = Debug|Win32

+		{88928401-2CE8-4568-AAA7-226141870CBF}.Debug|Win32.Build.0 = Debug|Win32

+		{88928401-2CE8-4568-AAA7-226141870CBF}.Debug|x64.ActiveCfg = Debug|x64

+		{88928401-2CE8-4568-AAA7-226141870CBF}.Debug|x64.Build.0 = Debug|x64

+		{88928401-2CE8-4568-AAA7-226141870CBF}.Release|Win32.ActiveCfg = Release|Win32

+		{88928401-2CE8-4568-AAA7-226141870CBF}.Release|Win32.Build.0 = Release|Win32

+		{88928401-2CE8-4568-AAA7-226141870CBF}.Release|x64.ActiveCfg = Release|x64

+		{88928401-2CE8-4568-AAA7-226141870CBF}.Release|x64.Build.0 = Release|x64

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

@@ -2146,6 +2156,7 @@ Global
 		{13E796AD-BEA4-4213-A1B8-E18E2397E544} = {A035B524-0F2D-45D0-BCF2-3C20279C77E2}

 		{AE708252-0DF8-42BA-9EF9-9ACC038EEDA7} = {A035B524-0F2D-45D0-BCF2-3C20279C77E2}

 		{D3E24A92-E2C3-440F-BC87-002AB822ABFB} = {A035B524-0F2D-45D0-BCF2-3C20279C77E2}

+		{88928401-2CE8-4568-AAA7-226141870CBF} = {A035B524-0F2D-45D0-BCF2-3C20279C77E2}

 	EndGlobalSection

 	GlobalSection(ExtensibilityGlobals) = postSolution

 		SolutionGuid = {29A0C2A8-07A4-4A8B-8BED-8F7D024013D6}

diff --git a/bin17/mir_icons.sln b/bin17/mir_icons.sln
index de2f2b3def..93a5cc0ac0 100644
--- a/bin17/mir_icons.sln
+++ b/bin17/mir_icons.sln
@@ -62,6 +62,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_WhatsApp", "..\protoc
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Telegram", "..\protocols\Telegram\proto_telegram\Proto_Telegram.vcxproj", "{129A4E61-45E8-E476-BD50-5E03BA80E9AD}"

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Discord", "..\protocols\Discord\proto_discord\Proto_Discord.vcxproj", "{6B8BA5EE-3815-44A6-A13B-2A22E8B3A311}"

+EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Win32 = Debug|Win32

@@ -310,6 +312,14 @@ Global
 		{129A4E61-45E8-E476-BD50-5E03BA80E9AD}.Release|Win32.Build.0 = Release|Win32

 		{129A4E61-45E8-E476-BD50-5E03BA80E9AD}.Release|x64.ActiveCfg = Release|x64

 		{129A4E61-45E8-E476-BD50-5E03BA80E9AD}.Release|x64.Build.0 = Release|x64

+		{6B8BA5EE-3815-44A6-A13B-2A22E8B3A311}.Debug|Win32.ActiveCfg = Debug|Win32

+		{6B8BA5EE-3815-44A6-A13B-2A22E8B3A311}.Debug|Win32.Build.0 = Debug|Win32

+		{6B8BA5EE-3815-44A6-A13B-2A22E8B3A311}.Debug|x64.ActiveCfg = Debug|x64

+		{6B8BA5EE-3815-44A6-A13B-2A22E8B3A311}.Debug|x64.Build.0 = Debug|x64

+		{6B8BA5EE-3815-44A6-A13B-2A22E8B3A311}.Release|Win32.ActiveCfg = Release|Win32

+		{6B8BA5EE-3815-44A6-A13B-2A22E8B3A311}.Release|Win32.Build.0 = Release|Win32

+		{6B8BA5EE-3815-44A6-A13B-2A22E8B3A311}.Release|x64.ActiveCfg = Release|x64

+		{6B8BA5EE-3815-44A6-A13B-2A22E8B3A311}.Release|x64.Build.0 = Release|x64

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt b/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt
index 5b2cd9a54a..61b5761ec2 100644
--- a/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt
+++ b/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt
@@ -42,6 +42,7 @@ Plugins\dbx_mdbx.dll
 Plugins\dbx_mmap.dll

 Plugins\dbx_sqlite.dll

 Plugins\db_autobackups.dll

+Plugins\discord.dll

 Plugins\dummy.dll

 Plugins\emlanproto.dll

 Plugins\exchange.dll

@@ -202,6 +203,7 @@ Icons\flags_icons.dll
 Icons\fp_icons.dll

 Icons\historypp_icons.dll

 Icons\proto_currencyrates.dll

+Icons\proto_discord.dll

 Icons\proto_dummy.dll

 Icons\proto_facebook.dll

 Icons\proto_gg.dll

diff --git a/tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt b/tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt
index b148f5f0f3..d2e6bcb16b 100644
--- a/tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt
+++ b/tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt
@@ -42,6 +42,7 @@ Plugins\dbx_mdbx.dll
 Plugins\dbx_mmap.dll

 Plugins\dbx_sqlite.dll

 Plugins\db_autobackups.dll

+Plugins\discord.dll

 Plugins\dummy.dll

 Plugins\emlanproto.dll

 Plugins\exchange.dll

@@ -201,6 +202,7 @@ Icons\flags_icons.dll
 Icons\fp_icons.dll

 Icons\historypp_icons.dll

 Icons\proto_currencyrates.dll

+Icons\proto_discord.dll

 Icons\proto_dummy.dll

 Icons\proto_facebook.dll

 Icons\proto_gg.dll

diff --git a/tools/build_scripts/z2_PackPluginUpdater.bat b/tools/build_scripts/z2_PackPluginUpdater.bat
index 81196c1692..0aa448c1c0 100644
--- a/tools/build_scripts/z2_PackPluginUpdater.bat
+++ b/tools/build_scripts/z2_PackPluginUpdater.bat
@@ -47,6 +47,7 @@ for /f %%a in ('dir plugins\*.dll /B /L') do (
 	if /I "%%a"=="CmdLine.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "MimCmd.exe")

 	if /I "%%a"=="CurrencyRates.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Icons\Proto_CurrencyRates.dll" "Plugins\CurrencyRates\*.xml" "Plugins\CurrencyRates\CurrencyRatesChart.exe")

 	if /I "%%a"=="Dbx_mdbx.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "mdbx_chk.exe" "mdbx_dump.exe" "mdbx_load.exe" "Libs\libmdbx.mir")

+	if /I "%%a"=="Discord.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Icons\Proto_Discord.dll")

 	if /I "%%a"=="Dummy.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Icons\Proto_Dummy.dll")

 	if /I "%%a"=="Facebook.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Icons\Proto_Facebook.dll")

 	if /I "%%a"=="FavContacts.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Gadgets\favcontacts.gadget")