From 4ab12bb105f250aa65057641caae5b17e283f7c1 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Tue, 23 Jun 2015 06:07:37 +0000 Subject: FloatingContacts: unified project git-svn-id: http://svn.miranda-ng.org/main/trunk@14342 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/FloatingContacts/FltCont.vcxproj | 33 ++++ plugins/FloatingContacts/FltCont.vcxproj.filters | 4 + plugins/FloatingContacts/FltCont_10.vcxproj | 213 -------------------- .../FloatingContacts/FltCont_10.vcxproj.filters | 71 ------- plugins/FloatingContacts/FltCont_12.vcxproj | 216 --------------------- .../FloatingContacts/FltCont_12.vcxproj.filters | 71 ------- plugins/FloatingContacts/src/bitmap_funcs.cpp | 2 +- plugins/FloatingContacts/src/filedrop.cpp | 2 +- plugins/FloatingContacts/src/main.cpp | 2 +- plugins/FloatingContacts/src/options.cpp | 4 +- plugins/FloatingContacts/src/stdafx.cpp | 18 -- plugins/FloatingContacts/src/stdafx.h | 37 ++++ plugins/FloatingContacts/src/stdhdr.h | 39 ---- plugins/FloatingContacts/src/thumbs.cpp | 3 +- 14 files changed, 81 insertions(+), 634 deletions(-) create mode 100644 plugins/FloatingContacts/FltCont.vcxproj create mode 100644 plugins/FloatingContacts/FltCont.vcxproj.filters delete mode 100644 plugins/FloatingContacts/FltCont_10.vcxproj delete mode 100644 plugins/FloatingContacts/FltCont_10.vcxproj.filters delete mode 100644 plugins/FloatingContacts/FltCont_12.vcxproj delete mode 100644 plugins/FloatingContacts/FltCont_12.vcxproj.filters delete mode 100644 plugins/FloatingContacts/src/stdafx.cpp create mode 100644 plugins/FloatingContacts/src/stdafx.h delete mode 100644 plugins/FloatingContacts/src/stdhdr.h (limited to 'plugins') diff --git a/plugins/FloatingContacts/FltCont.vcxproj b/plugins/FloatingContacts/FltCont.vcxproj new file mode 100644 index 0000000000..ba9593cd8c --- /dev/null +++ b/plugins/FloatingContacts/FltCont.vcxproj @@ -0,0 +1,33 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + FltContacts + {9290A9CC-3FDA-4FD6-A8A2-04AD4BA1C856} + + + + + + + NotUsing + + + \ No newline at end of file diff --git a/plugins/FloatingContacts/FltCont.vcxproj.filters b/plugins/FloatingContacts/FltCont.vcxproj.filters new file mode 100644 index 0000000000..de5ad9f66c --- /dev/null +++ b/plugins/FloatingContacts/FltCont.vcxproj.filters @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/plugins/FloatingContacts/FltCont_10.vcxproj b/plugins/FloatingContacts/FltCont_10.vcxproj deleted file mode 100644 index 77bea65c32..0000000000 --- a/plugins/FloatingContacts/FltCont_10.vcxproj +++ /dev/null @@ -1,213 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - FltContacts - {9290A9CC-3FDA-4FD6-A8A2-04AD4BA1C856} - - - - DynamicLibrary - Unicode - true - - - DynamicLibrary - Unicode - true - - - DynamicLibrary - Unicode - - - DynamicLibrary - Unicode - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - - - - Disabled - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - stdhdr.h - Level3 - EditAndContinue - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - Msimg32.lib;comctl32.lib;shlwapi.lib;%(AdditionalDependencies) - true - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\bin10\lib - - - - - Disabled - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - Use - stdhdr.h - Level3 - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - Msimg32.lib;comctl32.lib;shlwapi.lib;%(AdditionalDependencies) - true - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\bin10\lib - - - - - Full - Size - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - true - Use - stdhdr.h - Level3 - OnlyExplicitInline - false - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - Msimg32.lib;comctl32.lib;shlwapi.lib;%(AdditionalDependencies) - true - true - true - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\bin10\lib - /PDBALTPATH:%_PDB% - - - - - Full - Size - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - true - Use - stdhdr.h - Level3 - OnlyExplicitInline - false - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - Msimg32.lib;comctl32.lib;shlwapi.lib;%(AdditionalDependencies) - true - true - true - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\bin10\lib - /PDBALTPATH:%_PDB% - - - - - NotUsing - - - - - Create - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/FloatingContacts/FltCont_10.vcxproj.filters b/plugins/FloatingContacts/FltCont_10.vcxproj.filters deleted file mode 100644 index b177180304..0000000000 --- a/plugins/FloatingContacts/FltCont_10.vcxproj.filters +++ /dev/null @@ -1,71 +0,0 @@ - - - - - {84999e29-bc79-471f-9875-ab09dde3a08a} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {715cbea0-9043-4420-8266-8083bb9d03e1} - h;hpp;hxx;hm;inl - - - {fd5f5482-d8cc-42d5-b4e9-5055d6618caa} - ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - Resource Files - - - \ No newline at end of file diff --git a/plugins/FloatingContacts/FltCont_12.vcxproj b/plugins/FloatingContacts/FltCont_12.vcxproj deleted file mode 100644 index 7ccc1aa352..0000000000 --- a/plugins/FloatingContacts/FltCont_12.vcxproj +++ /dev/null @@ -1,216 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - FltContacts - {9290A9CC-3FDA-4FD6-A8A2-04AD4BA1C856} - - - - DynamicLibrary - Unicode - true - v120_xp - - - DynamicLibrary - Unicode - true - v120_xp - - - DynamicLibrary - Unicode - v120_xp - - - DynamicLibrary - Unicode - v120_xp - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - - - - Disabled - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Use - stdhdr.h - Level3 - EditAndContinue - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - Msimg32.lib;comctl32.lib;shlwapi.lib;%(AdditionalDependencies) - true - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\bin12\lib - false - - - - - Disabled - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - Use - stdhdr.h - Level3 - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - Msimg32.lib;comctl32.lib;shlwapi.lib;%(AdditionalDependencies) - true - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\bin12\lib - - - - - Full - Size - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - true - Use - stdhdr.h - Level3 - OnlyExplicitInline - false - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - Msimg32.lib;comctl32.lib;shlwapi.lib;%(AdditionalDependencies) - true - true - true - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\bin12\lib - - - - - Full - Size - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - true - Use - stdhdr.h - Level3 - OnlyExplicitInline - false - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - Msimg32.lib;comctl32.lib;shlwapi.lib;%(AdditionalDependencies) - true - true - true - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\bin12\lib - - - - - NotUsing - - - - - Create - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/FloatingContacts/FltCont_12.vcxproj.filters b/plugins/FloatingContacts/FltCont_12.vcxproj.filters deleted file mode 100644 index b177180304..0000000000 --- a/plugins/FloatingContacts/FltCont_12.vcxproj.filters +++ /dev/null @@ -1,71 +0,0 @@ - - - - - {84999e29-bc79-471f-9875-ab09dde3a08a} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {715cbea0-9043-4420-8266-8083bb9d03e1} - h;hpp;hxx;hm;inl - - - {fd5f5482-d8cc-42d5-b4e9-5055d6618caa} - ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - Resource Files - - - \ No newline at end of file diff --git a/plugins/FloatingContacts/src/bitmap_funcs.cpp b/plugins/FloatingContacts/src/bitmap_funcs.cpp index 47690ac980..25347c47fb 100644 --- a/plugins/FloatingContacts/src/bitmap_funcs.cpp +++ b/plugins/FloatingContacts/src/bitmap_funcs.cpp @@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "stdhdr.h" +#include "stdafx.h" #define PU_FONT_THRESHOLD 96 #define PU_BMP_ACCURATE_ARITHMETICS diff --git a/plugins/FloatingContacts/src/filedrop.cpp b/plugins/FloatingContacts/src/filedrop.cpp index 4280ed8f61..311c2acee2 100644 --- a/plugins/FloatingContacts/src/filedrop.cpp +++ b/plugins/FloatingContacts/src/filedrop.cpp @@ -1,4 +1,4 @@ -#include "stdhdr.h" +#include "stdafx.h" static void ProcessDroppedItems(char **ppDroppedItems, int nCount, char **ppFiles); static int CountDroppedFiles(char **ppDroppedItems, int nCount); diff --git a/plugins/FloatingContacts/src/main.cpp b/plugins/FloatingContacts/src/main.cpp index d16405ffbb..464521581a 100644 --- a/plugins/FloatingContacts/src/main.cpp +++ b/plugins/FloatingContacts/src/main.cpp @@ -14,7 +14,7 @@ This plugin has been tested to work under Windows ME, 2000 and XP. No warranty for any misbehaviour. */ -#include "stdhdr.h" +#include "stdafx.h" #include "../Utils/mir_fonts.h" diff --git a/plugins/FloatingContacts/src/options.cpp b/plugins/FloatingContacts/src/options.cpp index 3f6a7e8c0d..7cd5b9680d 100644 --- a/plugins/FloatingContacts/src/options.cpp +++ b/plugins/FloatingContacts/src/options.cpp @@ -1,5 +1,5 @@ - -#include "stdhdr.h" +#include "stdafx.h" +#pragma comment(lib, "shlwapi.lib") #define M_GUESSSAMEASBOXES (WM_USER + 18) diff --git a/plugins/FloatingContacts/src/stdafx.cpp b/plugins/FloatingContacts/src/stdafx.cpp deleted file mode 100644 index e111a5f498..0000000000 --- a/plugins/FloatingContacts/src/stdafx.cpp +++ /dev/null @@ -1,18 +0,0 @@ -/* -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 "stdhdr.h" \ No newline at end of file diff --git a/plugins/FloatingContacts/src/stdafx.h b/plugins/FloatingContacts/src/stdafx.h new file mode 100644 index 0000000000..f2d793f8be --- /dev/null +++ b/plugins/FloatingContacts/src/stdafx.h @@ -0,0 +1,37 @@ + +#ifndef __STDHDR_H__ +#define __STDHDR_H__ + +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "bitmap_funcs.h" +#include "fltcont.h" +#include "thumbs.h" +#include "filedrop.h" +#include "resource.h" +#include "version.h" + +///////////////////////////////////////////////////////////////////////////// + +#endif // #ifndef __STDHDR_H__ + +///////////////////////////////////////////////////////////////////////////// +// End Of File stdhdr.h diff --git a/plugins/FloatingContacts/src/stdhdr.h b/plugins/FloatingContacts/src/stdhdr.h deleted file mode 100644 index f4fa678833..0000000000 --- a/plugins/FloatingContacts/src/stdhdr.h +++ /dev/null @@ -1,39 +0,0 @@ - -#ifndef __STDHDR_H__ -#define __STDHDR_H__ - -#define _CRT_SECURE_NO_WARNINGS - -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "bitmap_funcs.h" -#include "fltcont.h" -#include "thumbs.h" -#include "filedrop.h" -#include "resource.h" -#include "version.h" - -///////////////////////////////////////////////////////////////////////////// - -#endif // #ifndef __STDHDR_H__ - -///////////////////////////////////////////////////////////////////////////// -// End Of File stdhdr.h diff --git a/plugins/FloatingContacts/src/thumbs.cpp b/plugins/FloatingContacts/src/thumbs.cpp index 455626dbc0..e5e3e09482 100644 --- a/plugins/FloatingContacts/src/thumbs.cpp +++ b/plugins/FloatingContacts/src/thumbs.cpp @@ -1,4 +1,5 @@ -#include "stdhdr.h" +#include "stdafx.h" +#pragma comment(lib, "Msimg32.lib") ThumbList thumbList; -- cgit v1.2.3