summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2018-06-24 18:38:31 +0300
committerGeorge Hazan <ghazan@miranda.im>2018-06-24 18:38:38 +0300
commitcf85302951f8b0ea4b706808928e5394a2d6124f (patch)
treebcfffbde2a9bb7d29d08e88259d2e897f6096b28
parenta135cee84423ff61a17e5d2fd86ec5eb2f0d6953 (diff)
ProxySwitch added to mir_full & build scripts
-rw-r--r--bin15/mir_full.sln12
-rw-r--r--tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt1
-rw-r--r--tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt1
3 files changed, 14 insertions, 0 deletions
diff --git a/bin15/mir_full.sln b/bin15/mir_full.sln
index ed706478f7..0f0357f2da 100644
--- a/bin15/mir_full.sln
+++ b/bin15/mir_full.sln
@@ -443,6 +443,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Encryption", "Encryption",
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Notifications", "Notifications", "{703CFA44-C8E8-4547-B597-AE239F4F6DD9}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1AD312F8-831B-4255-9888-3897A11B6C27}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ProxySwitch", "..\plugins\ProxySwitch\ProxySwitch.vcxproj", "{7446276D-5845-4258-A245-83D1D4D3CEC3}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -1993,6 +1997,14 @@ Global
{7DC23E4E-2448-4811-AABD-F5D069F6E74A}.Release|Win32.Build.0 = Release|Win32
{7DC23E4E-2448-4811-AABD-F5D069F6E74A}.Release|x64.ActiveCfg = Release|x64
{7DC23E4E-2448-4811-AABD-F5D069F6E74A}.Release|x64.Build.0 = Release|x64
+ {7446276D-5845-4258-A245-83D1D4D3CEC3}.Debug|Win32.ActiveCfg = Debug|Win32
+ {7446276D-5845-4258-A245-83D1D4D3CEC3}.Debug|Win32.Build.0 = Debug|Win32
+ {7446276D-5845-4258-A245-83D1D4D3CEC3}.Debug|x64.ActiveCfg = Debug|x64
+ {7446276D-5845-4258-A245-83D1D4D3CEC3}.Debug|x64.Build.0 = Debug|x64
+ {7446276D-5845-4258-A245-83D1D4D3CEC3}.Release|Win32.ActiveCfg = Release|Win32
+ {7446276D-5845-4258-A245-83D1D4D3CEC3}.Release|Win32.Build.0 = Release|Win32
+ {7446276D-5845-4258-A245-83D1D4D3CEC3}.Release|x64.ActiveCfg = Release|x64
+ {7446276D-5845-4258-A245-83D1D4D3CEC3}.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 235ffafbb4..5544d73223 100644
--- a/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt
+++ b/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt
@@ -107,6 +107,7 @@ Plugins\ping.dll
Plugins\pluginupdater.dll
Plugins\pmanagerex.dll
Plugins\popup.dll
+Plugins\proxyswitch.dll
Plugins\quickcontacts.dll
Plugins\quickmessages.dll
Plugins\quickreplies.dll
diff --git a/tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt b/tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt
index 064c8734f0..ed266584ee 100644
--- a/tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt
+++ b/tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt
@@ -105,6 +105,7 @@ Plugins\ping.dll
Plugins\pluginupdater.dll
Plugins\pmanagerex.dll
Plugins\popup.dll
+Plugins\proxyswitch.dll
Plugins\quickcontacts.dll
Plugins\quickmessages.dll
Plugins\quickreplies.dll