summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bin15/mir_icons.sln10
-rw-r--r--bin16/mir_icons.sln10
-rw-r--r--bin17/mir_icons.sln10
-rw-r--r--protocols/EmLanProto/CMakeLists.txt3
-rw-r--r--protocols/EmLanProto/proto_EmLanProto/CMakeLists.txt2
-rw-r--r--protocols/EmLanProto/proto_EmLanProto/proto_EmLanProto.vcxproj34
-rw-r--r--protocols/EmLanProto/proto_EmLanProto/proto_EmLanProto.vcxproj.filters14
-rw-r--r--protocols/EmLanProto/proto_EmLanProto/res/proto_EmLanProto.rc76
-rw-r--r--protocols/EmLanProto/proto_EmLanProto/src/resource.h22
-rw-r--r--tools/build_scripts/z2_PackPluginUpdater.bat1
10 files changed, 181 insertions, 1 deletions
diff --git a/bin15/mir_icons.sln b/bin15/mir_icons.sln
index 3bdaf6a035..dec0616cfa 100644
--- a/bin15/mir_icons.sln
+++ b/bin15/mir_icons.sln
@@ -64,6 +64,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Teams", "..\protocols
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_ICQ", "..\protocols\ICQCorp\Proto_icq\Proto_ICQ.vcxproj", "{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "proto_EmLanProto", "..\protocols\EmLanProto\proto_EmLanProto\proto_EmLanProto.vcxproj", "{2D0BE9D7-7FD3-4E3C-A272-F157E3F44D41}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -320,6 +322,14 @@ Global
{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Release|Win32.Build.0 = Release|Win32
{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Release|x64.ActiveCfg = Release|x64
{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Release|x64.Build.0 = Release|x64
+ {2D0BE9D7-7FD3-4E3C-A272-F157E3F44D41}.Debug|Win32.ActiveCfg = Debug|Win32
+ {2D0BE9D7-7FD3-4E3C-A272-F157E3F44D41}.Debug|Win32.Build.0 = Debug|Win32
+ {2D0BE9D7-7FD3-4E3C-A272-F157E3F44D41}.Debug|x64.ActiveCfg = Debug|x64
+ {2D0BE9D7-7FD3-4E3C-A272-F157E3F44D41}.Debug|x64.Build.0 = Debug|x64
+ {2D0BE9D7-7FD3-4E3C-A272-F157E3F44D41}.Release|Win32.ActiveCfg = Release|Win32
+ {2D0BE9D7-7FD3-4E3C-A272-F157E3F44D41}.Release|Win32.Build.0 = Release|Win32
+ {2D0BE9D7-7FD3-4E3C-A272-F157E3F44D41}.Release|x64.ActiveCfg = Release|x64
+ {2D0BE9D7-7FD3-4E3C-A272-F157E3F44D41}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/bin16/mir_icons.sln b/bin16/mir_icons.sln
index df811e7aa7..090c6f44e5 100644
--- a/bin16/mir_icons.sln
+++ b/bin16/mir_icons.sln
@@ -64,6 +64,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Teams", "..\protocols
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_ICQ", "..\protocols\ICQCorp\Proto_icq\Proto_ICQ.vcxproj", "{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "proto_EmLanProto", "..\protocols\EmLanProto\proto_EmLanProto\proto_EmLanProto.vcxproj", "{2D0BE9D7-7FD3-4E3C-A272-F157E3F44D41}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -320,6 +322,14 @@ Global
{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Release|Win32.Build.0 = Release|Win32
{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Release|x64.ActiveCfg = Release|x64
{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Release|x64.Build.0 = Release|x64
+ {2D0BE9D7-7FD3-4E3C-A272-F157E3F44D41}.Debug|Win32.ActiveCfg = Debug|Win32
+ {2D0BE9D7-7FD3-4E3C-A272-F157E3F44D41}.Debug|Win32.Build.0 = Debug|Win32
+ {2D0BE9D7-7FD3-4E3C-A272-F157E3F44D41}.Debug|x64.ActiveCfg = Debug|x64
+ {2D0BE9D7-7FD3-4E3C-A272-F157E3F44D41}.Debug|x64.Build.0 = Debug|x64
+ {2D0BE9D7-7FD3-4E3C-A272-F157E3F44D41}.Release|Win32.ActiveCfg = Release|Win32
+ {2D0BE9D7-7FD3-4E3C-A272-F157E3F44D41}.Release|Win32.Build.0 = Release|Win32
+ {2D0BE9D7-7FD3-4E3C-A272-F157E3F44D41}.Release|x64.ActiveCfg = Release|x64
+ {2D0BE9D7-7FD3-4E3C-A272-F157E3F44D41}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/bin17/mir_icons.sln b/bin17/mir_icons.sln
index b36b8b2fce..0184daac92 100644
--- a/bin17/mir_icons.sln
+++ b/bin17/mir_icons.sln
@@ -64,6 +64,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Teams", "..\protocols
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_ICQ", "..\protocols\ICQCorp\Proto_icq\Proto_ICQ.vcxproj", "{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "proto_EmLanProto", "..\protocols\EmLanProto\proto_EmLanProto\proto_EmLanProto.vcxproj", "{2D0BE9D7-7FD3-4E3C-A272-F157E3F44D41}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -320,6 +322,14 @@ Global
{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Release|Win32.Build.0 = Release|Win32
{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Release|x64.ActiveCfg = Release|x64
{DB3B0449-E576-4BBB-8B08-AB9E914D39CA}.Release|x64.Build.0 = Release|x64
+ {2D0BE9D7-7FD3-4E3C-A272-F157E3F44D41}.Debug|Win32.ActiveCfg = Debug|Win32
+ {2D0BE9D7-7FD3-4E3C-A272-F157E3F44D41}.Debug|Win32.Build.0 = Debug|Win32
+ {2D0BE9D7-7FD3-4E3C-A272-F157E3F44D41}.Debug|x64.ActiveCfg = Debug|x64
+ {2D0BE9D7-7FD3-4E3C-A272-F157E3F44D41}.Debug|x64.Build.0 = Debug|x64
+ {2D0BE9D7-7FD3-4E3C-A272-F157E3F44D41}.Release|Win32.ActiveCfg = Release|Win32
+ {2D0BE9D7-7FD3-4E3C-A272-F157E3F44D41}.Release|Win32.Build.0 = Release|Win32
+ {2D0BE9D7-7FD3-4E3C-A272-F157E3F44D41}.Release|x64.ActiveCfg = Release|x64
+ {2D0BE9D7-7FD3-4E3C-A272-F157E3F44D41}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/protocols/EmLanProto/CMakeLists.txt b/protocols/EmLanProto/CMakeLists.txt
index c109f097f4..021f81bd55 100644
--- a/protocols/EmLanProto/CMakeLists.txt
+++ b/protocols/EmLanProto/CMakeLists.txt
@@ -2,4 +2,5 @@ set_directory_properties(PROPERTIES COMPILE_DEFINITIONS "")
file(GLOB SOURCES "src/*.h" "src/*.cpp" "res/*.rc")
set(TARGET EmLanProto)
-include(${CMAKE_SOURCE_DIR}/cmake/plugin.cmake) \ No newline at end of file
+include(${CMAKE_SOURCE_DIR}/cmake/plugin.cmake)
+add_subdirectory(proto_EmLanProto)
diff --git a/protocols/EmLanProto/proto_EmLanProto/CMakeLists.txt b/protocols/EmLanProto/proto_EmLanProto/CMakeLists.txt
new file mode 100644
index 0000000000..e7ebd6843d
--- /dev/null
+++ b/protocols/EmLanProto/proto_EmLanProto/CMakeLists.txt
@@ -0,0 +1,2 @@
+set(TARGET proto_EmLanProto)
+include(${CMAKE_SOURCE_DIR}/cmake/icons.cmake) \ No newline at end of file
diff --git a/protocols/EmLanProto/proto_EmLanProto/proto_EmLanProto.vcxproj b/protocols/EmLanProto/proto_EmLanProto/proto_EmLanProto.vcxproj
new file mode 100644
index 0000000000..2e73e96c19
--- /dev/null
+++ b/protocols/EmLanProto/proto_EmLanProto/proto_EmLanProto.vcxproj
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectName>Proto_Em_Lan_Proto</ProjectName>
+ <ProjectGuid>{2D0BE9D7-7FD3-4E3C-A272-F157E3F44D41}</ProjectGuid>
+ </PropertyGroup>
+ <ImportGroup Label="PropertySheets">
+ <Import Project="$(ProjectDir)..\..\..\build\vc.common\icons.props" />
+ </ImportGroup>
+ <ItemGroup>
+ <ClInclude Include="src\resource.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="res\Proto_EmlanProto.rc" />
+ </ItemGroup>
+</Project> \ No newline at end of file
diff --git a/protocols/EmLanProto/proto_EmLanProto/proto_EmLanProto.vcxproj.filters b/protocols/EmLanProto/proto_EmLanProto/proto_EmLanProto.vcxproj.filters
new file mode 100644
index 0000000000..83c99ca553
--- /dev/null
+++ b/protocols/EmLanProto/proto_EmLanProto/proto_EmLanProto.vcxproj.filters
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$(ProjectDir)..\..\..\build\vc.common\common.filters" />
+ <ItemGroup>
+ <ClInclude Include="src\resource.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="res\Proto_EmlanProto.rc">
+ <Filter>Resource Files</Filter>
+ </ResourceCompile>
+ </ItemGroup>
+</Project> \ No newline at end of file
diff --git a/protocols/EmLanProto/proto_EmLanProto/res/proto_EmLanProto.rc b/protocols/EmLanProto/proto_EmLanProto/res/proto_EmLanProto.rc
new file mode 100644
index 0000000000..c781dd4d29
--- /dev/null
+++ b/protocols/EmLanProto/proto_EmLanProto/res/proto_EmLanProto.rc
@@ -0,0 +1,76 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "..\src\resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// Russian (Russia) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
+LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE
+BEGIN
+ "..\\src\\resource.h\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+ "#include ""afxres.h""\r\n"
+ "\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+ "\r\n"
+ "\0"
+END
+
+#endif // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with the lowest ID value placed first to ensure the application icon
+// remains consistent on all systems.
+IDI_ICON1 ICON "Offline.ico"
+IDI_ICON2 ICON "Online.ico"
+IDI_ICON3 ICON "Away.ico"
+IDI_ICON5 ICON "NA.ico"
+IDI_ICON6 ICON "DND.ico"
+IDI_ICON7 ICON "Occupied.ico"
+IDI_ICON8 ICON "FFC.ico"
+
+#endif // Russian (Russia) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif // not APSTUDIO_INVOKED
+
diff --git a/protocols/EmLanProto/proto_EmLanProto/src/resource.h b/protocols/EmLanProto/proto_EmLanProto/src/resource.h
new file mode 100644
index 0000000000..ad76f6f52a
--- /dev/null
+++ b/protocols/EmLanProto/proto_EmLanProto/src/resource.h
@@ -0,0 +1,22 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by Proto_Jabber.rc
+//
+#define IDI_ICON1 105
+#define IDI_ICON2 104
+#define IDI_ICON3 128
+#define IDI_ICON5 131
+#define IDI_ICON6 158
+#define IDI_ICON7 159
+#define IDI_ICON8 129
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE 108
+#define _APS_NEXT_COMMAND_VALUE 40001
+#define _APS_NEXT_CONTROL_VALUE 1001
+#define _APS_NEXT_SYMED_VALUE 101
+#endif
+#endif
diff --git a/tools/build_scripts/z2_PackPluginUpdater.bat b/tools/build_scripts/z2_PackPluginUpdater.bat
index a5f15f5ae8..6e10dac92b 100644
--- a/tools/build_scripts/z2_PackPluginUpdater.bat
+++ b/tools/build_scripts/z2_PackPluginUpdater.bat
@@ -48,6 +48,7 @@ for /f %%a in ('dir plugins\*.dll /B /L') do (
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"=="Dummy.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Icons\Proto_Dummy.dll")
+ if /I "%%a"=="EmLanProto.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Icons\Proto_Em_Lan_Proto.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")
if /I "%%a"=="Fingerprint.dll" (%ZipIt% "%Arch%\Plugins\%%~na.zip" "Icons\Fp_icons.dll")
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-07 04:44:46 +0000