From 18cb91d6c518f733c7a2db59b1d849adc6eaa7c5 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Sat, 2 May 2015 08:05:55 +0000 Subject: Proto_MSN - unified project git-svn-id: http://svn.miranda-ng.org/main/trunk@13359 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- bin10/mir_icons.sln | 2 +- bin10/miranda32.sln | 2 +- bin12/mir_icons.sln | 2 +- bin12/miranda32.sln | 2 +- protocols/MSN/proto_msn/Proto_MSN.vcxproj | 28 +++++ protocols/MSN/proto_msn/Proto_MSN.vcxproj.filters | 4 + protocols/MSN/proto_msn/Proto_MSN_10.vcxproj | 131 -------------------- .../MSN/proto_msn/Proto_MSN_10.vcxproj.filters | 23 ---- protocols/MSN/proto_msn/Proto_MSN_12.vcxproj | 135 --------------------- .../MSN/proto_msn/Proto_MSN_12.vcxproj.filters | 23 ---- 10 files changed, 36 insertions(+), 316 deletions(-) create mode 100644 protocols/MSN/proto_msn/Proto_MSN.vcxproj create mode 100644 protocols/MSN/proto_msn/Proto_MSN.vcxproj.filters delete mode 100644 protocols/MSN/proto_msn/Proto_MSN_10.vcxproj delete mode 100644 protocols/MSN/proto_msn/Proto_MSN_10.vcxproj.filters delete mode 100644 protocols/MSN/proto_msn/Proto_MSN_12.vcxproj delete mode 100644 protocols/MSN/proto_msn/Proto_MSN_12.vcxproj.filters diff --git a/bin10/mir_icons.sln b/bin10/mir_icons.sln index d5d5f44c55..8bdc8eccbe 100644 --- a/bin10/mir_icons.sln +++ b/bin10/mir_icons.sln @@ -28,7 +28,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Jabber", "..\protocol EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_MRA", "..\protocols\MRA\proto_mra\Proto_MRA.vcxproj", "{38BF6F63-58E7-442D-A7E8-B4BD57D224E2}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_MSN", "..\protocols\MSN\proto_msn\Proto_MSN_10.vcxproj", "{7BC6C3E7-2B17-4718-A82E-084798710E14}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_MSN", "..\protocols\MSN\proto_msn\Proto_MSN.vcxproj", "{7BC6C3E7-2B17-4718-A82E-084798710E14}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_GG", "..\protocols\Gadu-Gadu\proto_gg\Proto_GG.vcxproj", "{33912E32-3B68-4E2C-82AE-64C06EE987A7}" EndProject diff --git a/bin10/miranda32.sln b/bin10/miranda32.sln index 321855b62a..bbda68d3cc 100644 --- a/bin10/miranda32.sln +++ b/bin10/miranda32.sln @@ -53,7 +53,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_IRC", "..\protocols\I EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Jabber", "..\protocols\JabberG\proto_jabber\Proto_Jabber.vcxproj", "{1AA0A504-0644-4F00-A1AD-F55D69E50DD0}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_MSN", "..\protocols\MSN\proto_msn\Proto_MSN_10.vcxproj", "{7BC6C3E7-2B17-4718-A82E-084798710E14}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_MSN", "..\protocols\MSN\proto_msn\Proto_MSN.vcxproj", "{7BC6C3E7-2B17-4718-A82E-084798710E14}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Yahoo", "..\protocols\Yahoo\proto_yahoo\Proto_Yahoo_10.vcxproj", "{BFEBA9D5-CAB7-42C0-BE0B-0888A7A458AB}" EndProject diff --git a/bin12/mir_icons.sln b/bin12/mir_icons.sln index 46bc05043e..ec71783be7 100644 --- a/bin12/mir_icons.sln +++ b/bin12/mir_icons.sln @@ -30,7 +30,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Jabber", "..\protocol EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_MRA", "..\protocols\MRA\proto_mra\Proto_MRA.vcxproj", "{38BF6F63-58E7-442D-A7E8-B4BD57D224E2}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_MSN", "..\protocols\MSN\proto_msn\Proto_MSN_12.vcxproj", "{7BC6C3E7-2B17-4718-A82E-084798710E14}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_MSN", "..\protocols\MSN\proto_msn\Proto_MSN.vcxproj", "{7BC6C3E7-2B17-4718-A82E-084798710E14}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_GG", "..\protocols\Gadu-Gadu\proto_gg\Proto_GG.vcxproj", "{33912E32-3B68-4E2C-82AE-64C06EE987A7}" EndProject diff --git a/bin12/miranda32.sln b/bin12/miranda32.sln index 3cc3519110..f9743aebf2 100644 --- a/bin12/miranda32.sln +++ b/bin12/miranda32.sln @@ -55,7 +55,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_IRC", "..\protocols\I EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Jabber", "..\protocols\JabberG\proto_jabber\Proto_Jabber.vcxproj", "{1AA0A504-0644-4F00-A1AD-F55D69E50DD0}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_MSN", "..\protocols\MSN\proto_msn\Proto_MSN_12.vcxproj", "{7BC6C3E7-2B17-4718-A82E-084798710E14}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_MSN", "..\protocols\MSN\proto_msn\Proto_MSN.vcxproj", "{7BC6C3E7-2B17-4718-A82E-084798710E14}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Yahoo", "..\protocols\Yahoo\proto_yahoo\Proto_Yahoo_12.vcxproj", "{BFEBA9D5-CAB7-42C0-BE0B-0888A7A458AB}" EndProject diff --git a/protocols/MSN/proto_msn/Proto_MSN.vcxproj b/protocols/MSN/proto_msn/Proto_MSN.vcxproj new file mode 100644 index 0000000000..24dc5a353d --- /dev/null +++ b/protocols/MSN/proto_msn/Proto_MSN.vcxproj @@ -0,0 +1,28 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + Proto_MSN + {7BC6C3E7-2B17-4718-A82E-084798710E14} + + + + + \ No newline at end of file diff --git a/protocols/MSN/proto_msn/Proto_MSN.vcxproj.filters b/protocols/MSN/proto_msn/Proto_MSN.vcxproj.filters new file mode 100644 index 0000000000..e39f86d5d6 --- /dev/null +++ b/protocols/MSN/proto_msn/Proto_MSN.vcxproj.filters @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/protocols/MSN/proto_msn/Proto_MSN_10.vcxproj b/protocols/MSN/proto_msn/Proto_MSN_10.vcxproj deleted file mode 100644 index b1f887ef0e..0000000000 --- a/protocols/MSN/proto_msn/Proto_MSN_10.vcxproj +++ /dev/null @@ -1,131 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {7BC6C3E7-2B17-4718-A82E-084798710E14} - Proto_MSN - - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\Icons\ - $(SolutionDir)$(Configuration)64\Icons\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Icons\ - $(SolutionDir)$(Configuration)64\Icons\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - - - - Windows - true - false - $(SolutionDir)\lib - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\..\include\msapi - - - - - Windows - true - false - $(SolutionDir)\lib - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\..\include\msapi - - - - - Windows - true - false - $(SolutionDir)\lib - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\..\include\msapi - - - - - Windows - true - false - $(SolutionDir)\lib - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\..\include\msapi - - - - - - - - - - - - \ No newline at end of file diff --git a/protocols/MSN/proto_msn/Proto_MSN_10.vcxproj.filters b/protocols/MSN/proto_msn/Proto_MSN_10.vcxproj.filters deleted file mode 100644 index 13a42fab36..0000000000 --- a/protocols/MSN/proto_msn/Proto_MSN_10.vcxproj.filters +++ /dev/null @@ -1,23 +0,0 @@ - - - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/protocols/MSN/proto_msn/Proto_MSN_12.vcxproj b/protocols/MSN/proto_msn/Proto_MSN_12.vcxproj deleted file mode 100644 index e85378ccbb..0000000000 --- a/protocols/MSN/proto_msn/Proto_MSN_12.vcxproj +++ /dev/null @@ -1,135 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {7BC6C3E7-2B17-4718-A82E-084798710E14} - Proto_MSN - - - - DynamicLibrary - true - Unicode - v120_xp - - - DynamicLibrary - true - Unicode - v120_xp - - - DynamicLibrary - false - Unicode - v120_xp - - - DynamicLibrary - false - Unicode - v120_xp - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\Icons\ - $(SolutionDir)$(Configuration)64\Icons\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Icons\ - $(SolutionDir)$(Configuration)64\Icons\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - - - - Windows - true - false - $(SolutionDir)\lib - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\..\include\msapi - - - - - Windows - true - false - $(SolutionDir)\lib - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\..\include\msapi - - - - - Windows - true - false - $(SolutionDir)\lib - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\..\include\msapi - - - - - Windows - true - false - $(SolutionDir)\lib - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\..\include\msapi - - - - - - - - - - - - \ No newline at end of file diff --git a/protocols/MSN/proto_msn/Proto_MSN_12.vcxproj.filters b/protocols/MSN/proto_msn/Proto_MSN_12.vcxproj.filters deleted file mode 100644 index 13a42fab36..0000000000 --- a/protocols/MSN/proto_msn/Proto_MSN_12.vcxproj.filters +++ /dev/null @@ -1,23 +0,0 @@ - - - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - - - Resource Files - - - \ No newline at end of file -- cgit v1.2.3