From f7b8fb15fd81fe2a746a9410ea42ea7784e8249d Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Fri, 1 May 2015 17:39:05 +0000 Subject: Proto_AIM - unified project git-svn-id: http://svn.miranda-ng.org/main/trunk@13339 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- bin10/mir_icons.sln | 2 +- bin10/miranda32.sln | 2 +- bin12/mir_icons.sln | 2 +- bin12/miranda32.sln | 2 +- protocols/AimOscar/proto_aim/Proto_AIM.vcxproj | 28 +++++ .../AimOscar/proto_aim/Proto_AIM.vcxproj.filters | 4 + protocols/AimOscar/proto_aim/Proto_AIM_10.vcxproj | 131 -------------------- .../proto_aim/Proto_AIM_10.vcxproj.filters | 23 ---- protocols/AimOscar/proto_aim/Proto_AIM_12.vcxproj | 135 --------------------- .../proto_aim/Proto_AIM_12.vcxproj.filters | 23 ---- protocols/AimOscar/proto_aim/src/stdafx.cxx | 18 +++ protocols/AimOscar/proto_aim/src/stdafx.h | 18 +++ 12 files changed, 72 insertions(+), 316 deletions(-) create mode 100644 protocols/AimOscar/proto_aim/Proto_AIM.vcxproj create mode 100644 protocols/AimOscar/proto_aim/Proto_AIM.vcxproj.filters delete mode 100644 protocols/AimOscar/proto_aim/Proto_AIM_10.vcxproj delete mode 100644 protocols/AimOscar/proto_aim/Proto_AIM_10.vcxproj.filters delete mode 100644 protocols/AimOscar/proto_aim/Proto_AIM_12.vcxproj delete mode 100644 protocols/AimOscar/proto_aim/Proto_AIM_12.vcxproj.filters create mode 100644 protocols/AimOscar/proto_aim/src/stdafx.cxx create mode 100644 protocols/AimOscar/proto_aim/src/stdafx.h diff --git a/bin10/mir_icons.sln b/bin10/mir_icons.sln index d628ba8af8..e3de1124d6 100644 --- a/bin10/mir_icons.sln +++ b/bin10/mir_icons.sln @@ -16,7 +16,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UInfoEx_icons_ice_Z1", "..\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UInfoEx_icons_ice_Z2", "..\plugins\UserInfoEx\IconPacks\ice\icons_ice_10_z2.vcxproj", "{E787B42A-6489-4078-90CD-B78B751A1284}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_AIM", "..\protocols\AimOscar\proto_aim\Proto_AIM_10.vcxproj", "{975505EA-F0C7-4DAC-A95E-75249615F30C}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_AIM", "..\protocols\AimOscar\proto_aim\Proto_AIM.vcxproj", "{975505EA-F0C7-4DAC-A95E-75249615F30C}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Facebook", "..\protocols\FacebookRM\proto_facebook\Proto_Facebook_10.vcxproj", "{44298314-7DD4-4EF7-B576-30E503257223}" EndProject diff --git a/bin10/miranda32.sln b/bin10/miranda32.sln index 85ee781ca7..94ef96ef64 100644 --- a/bin10/miranda32.sln +++ b/bin10/miranda32.sln @@ -43,7 +43,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xStatus_Jabber", "..\protoc EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cln_skinedit", "..\plugins\clist_nicer\skineditor\skinedit_10.vcxproj", "{987F026D-EB1F-4013-ADA8-2406ACCDA526}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_AIM", "..\protocols\AimOscar\proto_aim\Proto_AIM_10.vcxproj", "{975505EA-F0C7-4DAC-A95E-75249615F30C}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_AIM", "..\protocols\AimOscar\proto_aim\Proto_AIM.vcxproj", "{975505EA-F0C7-4DAC-A95E-75249615F30C}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_GG", "..\protocols\Gadu-Gadu\proto_gg\Proto_GG_10.vcxproj", "{33912E32-3B68-4E2C-82AE-64C06EE987A7}" EndProject diff --git a/bin12/mir_icons.sln b/bin12/mir_icons.sln index ba75b10adb..a8d98a47a0 100644 --- a/bin12/mir_icons.sln +++ b/bin12/mir_icons.sln @@ -18,7 +18,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UInfoEx_icons_ice_Z1", "..\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UInfoEx_icons_ice_Z2", "..\plugins\UserInfoEx\IconPacks\ice\icons_ice_12_z2.vcxproj", "{E787B42A-6489-4078-90CD-B78B751A1284}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_AIM", "..\protocols\AimOscar\proto_aim\Proto_AIM_12.vcxproj", "{975505EA-F0C7-4DAC-A95E-75249615F30C}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_AIM", "..\protocols\AimOscar\proto_aim\Proto_AIM.vcxproj", "{975505EA-F0C7-4DAC-A95E-75249615F30C}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Facebook", "..\protocols\FacebookRM\proto_facebook\Proto_Facebook_12.vcxproj", "{44298314-7DD4-4EF7-B576-30E503257223}" EndProject diff --git a/bin12/miranda32.sln b/bin12/miranda32.sln index 5ef7e41048..cbac0e73bd 100644 --- a/bin12/miranda32.sln +++ b/bin12/miranda32.sln @@ -45,7 +45,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xStatus_Jabber", "..\protoc EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cln_skinedit", "..\plugins\clist_nicer\skineditor\skinedit_12.vcxproj", "{987F026D-EB1F-4013-ADA8-2406ACCDA526}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_AIM", "..\protocols\AimOscar\proto_aim\Proto_AIM_12.vcxproj", "{975505EA-F0C7-4DAC-A95E-75249615F30C}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_AIM", "..\protocols\AimOscar\proto_aim\Proto_AIM.vcxproj", "{975505EA-F0C7-4DAC-A95E-75249615F30C}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_GG", "..\protocols\Gadu-Gadu\proto_gg\Proto_GG_12.vcxproj", "{33912E32-3B68-4E2C-82AE-64C06EE987A7}" EndProject diff --git a/protocols/AimOscar/proto_aim/Proto_AIM.vcxproj b/protocols/AimOscar/proto_aim/Proto_AIM.vcxproj new file mode 100644 index 0000000000..63073e8ff3 --- /dev/null +++ b/protocols/AimOscar/proto_aim/Proto_AIM.vcxproj @@ -0,0 +1,28 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + Proto_AIM + {975505EA-F0C7-4DAC-A95E-75249615F30C} + + + + + \ No newline at end of file diff --git a/protocols/AimOscar/proto_aim/Proto_AIM.vcxproj.filters b/protocols/AimOscar/proto_aim/Proto_AIM.vcxproj.filters new file mode 100644 index 0000000000..e39f86d5d6 --- /dev/null +++ b/protocols/AimOscar/proto_aim/Proto_AIM.vcxproj.filters @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/protocols/AimOscar/proto_aim/Proto_AIM_10.vcxproj b/protocols/AimOscar/proto_aim/Proto_AIM_10.vcxproj deleted file mode 100644 index 6534f85c0f..0000000000 --- a/protocols/AimOscar/proto_aim/Proto_AIM_10.vcxproj +++ /dev/null @@ -1,131 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {975505EA-F0C7-4DAC-A95E-75249615F30C} - Proto_AIM - - - - true - Unicode - DynamicLibrary - - - true - Unicode - DynamicLibrary - - - false - Unicode - DynamicLibrary - - - false - Unicode - DynamicLibrary - - - - - - - - - - - - - - - - - - - <_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/AimOscar/proto_aim/Proto_AIM_10.vcxproj.filters b/protocols/AimOscar/proto_aim/Proto_AIM_10.vcxproj.filters deleted file mode 100644 index e71a3f5de4..0000000000 --- a/protocols/AimOscar/proto_aim/Proto_AIM_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 - - - - - Resource Files - - - - - Header Files - - - \ No newline at end of file diff --git a/protocols/AimOscar/proto_aim/Proto_AIM_12.vcxproj b/protocols/AimOscar/proto_aim/Proto_AIM_12.vcxproj deleted file mode 100644 index 29f1c65077..0000000000 --- a/protocols/AimOscar/proto_aim/Proto_AIM_12.vcxproj +++ /dev/null @@ -1,135 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {975505EA-F0C7-4DAC-A95E-75249615F30C} - Proto_AIM - - - - true - Unicode - DynamicLibrary - v120_xp - - - true - Unicode - DynamicLibrary - v120_xp - - - false - Unicode - DynamicLibrary - v120_xp - - - false - Unicode - DynamicLibrary - 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/AimOscar/proto_aim/Proto_AIM_12.vcxproj.filters b/protocols/AimOscar/proto_aim/Proto_AIM_12.vcxproj.filters deleted file mode 100644 index e71a3f5de4..0000000000 --- a/protocols/AimOscar/proto_aim/Proto_AIM_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 - - - - - Resource Files - - - - - Header Files - - - \ No newline at end of file diff --git a/protocols/AimOscar/proto_aim/src/stdafx.cxx b/protocols/AimOscar/proto_aim/src/stdafx.cxx new file mode 100644 index 0000000000..6fb37564b7 --- /dev/null +++ b/protocols/AimOscar/proto_aim/src/stdafx.cxx @@ -0,0 +1,18 @@ +/* +Copyright (C) 2012-15 Miranda NG project (http://miranda-ng.org) + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation version 2 +of the License. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include "stdafx.h" \ No newline at end of file diff --git a/protocols/AimOscar/proto_aim/src/stdafx.h b/protocols/AimOscar/proto_aim/src/stdafx.h new file mode 100644 index 0000000000..25a6e7584a --- /dev/null +++ b/protocols/AimOscar/proto_aim/src/stdafx.h @@ -0,0 +1,18 @@ +/* +Copyright (C) 2012-15 Miranda NG project (http://miranda-ng.org) + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation version 2 +of the License. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include "resource.h" \ No newline at end of file -- cgit v1.2.3