From e7efd3336abb30aaab0aa1a202c1ac10e502c5c8 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sun, 24 Feb 2013 17:04:48 +0000 Subject: added precompiled header added version info git-svn-id: http://svn.miranda-ng.org/main/trunk@3758 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Folders/folders_10.vcxproj | 22 +++++--- plugins/Folders/folders_10.vcxproj.filters | 6 +-- plugins/Folders/folders_11.vcxproj | 22 +++++--- plugins/Folders/folders_11.vcxproj.filters | 6 +-- plugins/Folders/res/version.rc | 85 ++++-------------------------- plugins/Folders/src/commonheaders.h | 32 +++++------ plugins/Folders/src/dlg_handlers.cpp | 2 +- plugins/Folders/src/events.cpp | 2 +- plugins/Folders/src/folderItem.cpp | 2 - plugins/Folders/src/folders.cpp | 15 ++---- plugins/Folders/src/foldersList.cpp | 2 +- plugins/Folders/src/hooked_events.cpp | 14 +---- plugins/Folders/src/services.cpp | 2 +- plugins/Folders/src/stdafx.cpp | 18 +++++++ plugins/Folders/src/utils.cpp | 2 +- plugins/Folders/src/version.h | 59 +++++---------------- 16 files changed, 101 insertions(+), 190 deletions(-) create mode 100644 plugins/Folders/src/stdafx.cpp (limited to 'plugins') diff --git a/plugins/Folders/folders_10.vcxproj b/plugins/Folders/folders_10.vcxproj index 769a44b002..d9dfeed4fd 100644 --- a/plugins/Folders/folders_10.vcxproj +++ b/plugins/Folders/folders_10.vcxproj @@ -73,13 +73,15 @@ Disabled ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;FOLDERS_EXPORTS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL Level3 EditAndContinue false + Use + commonheaders.h true @@ -98,12 +100,14 @@ Disabled ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN64;_DEBUG;_WINDOWS;_USRDLL;FOLDERS_EXPORTS;%(PreprocessorDefinitions) + WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL Level3 false + Use + commonheaders.h true @@ -123,10 +127,12 @@ Full Size ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;FOLDERS_EXPORTS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) Level3 OnlyExplicitInline false + Use + commonheaders.h true @@ -149,10 +155,12 @@ Full Size ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN64;NDEBUG;_WINDOWS;_USRDLL;FOLDERS_EXPORTS;%(PreprocessorDefinitions) + WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) Level3 OnlyExplicitInline false + Use + commonheaders.h true @@ -178,6 +186,9 @@ + + Create + @@ -196,9 +207,6 @@ - - - diff --git a/plugins/Folders/folders_10.vcxproj.filters b/plugins/Folders/folders_10.vcxproj.filters index c47cbf8139..2a6e8eea72 100644 --- a/plugins/Folders/folders_10.vcxproj.filters +++ b/plugins/Folders/folders_10.vcxproj.filters @@ -39,6 +39,9 @@ Source Files + + Source Files + @@ -80,7 +83,4 @@ Resource Files - - - \ No newline at end of file diff --git a/plugins/Folders/folders_11.vcxproj b/plugins/Folders/folders_11.vcxproj index 623aff7e4e..861ea373d2 100644 --- a/plugins/Folders/folders_11.vcxproj +++ b/plugins/Folders/folders_11.vcxproj @@ -77,13 +77,15 @@ Disabled ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;FOLDERS_EXPORTS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL Level3 EditAndContinue false + Use + commonheaders.h true @@ -102,12 +104,14 @@ Disabled ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN64;_DEBUG;_WINDOWS;_USRDLL;FOLDERS_EXPORTS;%(PreprocessorDefinitions) + WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL Level3 false + Use + commonheaders.h true @@ -127,10 +131,12 @@ Full Size ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;FOLDERS_EXPORTS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) Level3 OnlyExplicitInline false + Use + commonheaders.h true @@ -153,10 +159,12 @@ Full Size ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - WIN64;NDEBUG;_WINDOWS;_USRDLL;FOLDERS_EXPORTS;%(PreprocessorDefinitions) + WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) Level3 OnlyExplicitInline false + Use + commonheaders.h true @@ -182,6 +190,9 @@ + + Create + @@ -200,9 +211,6 @@ - - - diff --git a/plugins/Folders/folders_11.vcxproj.filters b/plugins/Folders/folders_11.vcxproj.filters index c47cbf8139..2a6e8eea72 100644 --- a/plugins/Folders/folders_11.vcxproj.filters +++ b/plugins/Folders/folders_11.vcxproj.filters @@ -39,6 +39,9 @@ Source Files + + Source Files + @@ -80,7 +83,4 @@ Resource Files - - - \ No newline at end of file diff --git a/plugins/Folders/res/version.rc b/plugins/Folders/res/version.rc index 1f804dd096..5bfbab4754 100644 --- a/plugins/Folders/res/version.rc +++ b/plugins/Folders/res/version.rc @@ -4,61 +4,12 @@ #error this file is not editable by Microsoft Visual C++ #endif //APSTUDIO_INVOKED -#include "..\src\version.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// #include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "resource1.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// +#include "..\src\version.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION __PLUGINVERSION_STRING - PRODUCTVERSION __PLUGINVERSION_STRING + FILEVERSION __FILEVERSION_STRING + PRODUCTVERSION __FILEVERSION_STRING FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -66,38 +17,22 @@ VS_VERSION_INFO VERSIONINFO FILEFLAGS 0x0L #endif FILEOS 0x4L - FILETYPE 0x2L + FILETYPE 0x0L FILESUBTYPE 0x0L BEGIN BLOCK "StringFileInfo" BEGIN - BLOCK "040904b0" + BLOCK "000004b0" BEGIN - VALUE "Author", __AUTHOR - VALUE "FileDescription", __DESC - VALUE "FileVersion", __VERSION_STRING - VALUE "InternalName", __PLUGIN_DISPLAY_NAME + VALUE "FileDescription", __DESCRIPTION + VALUE "InternalName", __PLUGIN_NAME VALUE "LegalCopyright", __COPYRIGHT + VALUE "OriginalFilename", __FILENAME + VALUE "ProductName", __PLUGIN_NAME END END BLOCK "VarFileInfo" BEGIN - VALUE "Translation", 0x409, 1200 + VALUE "Translation", 0x0, 1200 END END - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/plugins/Folders/src/commonheaders.h b/plugins/Folders/src/commonheaders.h index 1b5b1be6f2..0734f8db26 100644 --- a/plugins/Folders/src/commonheaders.h +++ b/plugins/Folders/src/commonheaders.h @@ -25,38 +25,32 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define MAX_FOLDER_SIZE 2048 -#include -#include -#include #include -#include "newpluginapi.h" -#include "m_utils.h" -#include "m_folders.h" +#include +#include +#include +#include + +#include +#include #include "version.h" #include "utils.h" #include "resource.h" #include "foldersList.h" #include "dlg_handlers.h" - -#include "m_database.h" -#include "m_system.h" -#include "m_system_cpp.h" -#include "m_skin.h" -#include "m_options.h" -#include "m_clist.h" -#include "m_langpack.h" -#include "m_history.h" -#include "m_contacts.h" -#include "m_popup.h" -#include "m_fontservice.h" -#include "m_variables.h" +#include "hooked_events.h" +#include "services.h" +#include "events.h" +#include "folderItem.h" #ifndef MS_DB_GETPROFILEPATH_BASIC //db3xSA #define MS_DB_GETPROFILEPATH_BASIC "DB/GetProfilePathBasic" #endif +#define MS_FOLDERS_TEST_PLUGIN "Folders/Test/Plugin" + extern char ModuleName[]; extern HINSTANCE hInstance; extern CFoldersList &lstRegisteredFolders; diff --git a/plugins/Folders/src/dlg_handlers.cpp b/plugins/Folders/src/dlg_handlers.cpp index 48ed983d11..d36a68ebc3 100644 --- a/plugins/Folders/src/dlg_handlers.cpp +++ b/plugins/Folders/src/dlg_handlers.cpp @@ -1,4 +1,4 @@ -#include "dlg_handlers.h" +#include "commonheaders.h" PFolderItem lastItem = NULL; diff --git a/plugins/Folders/src/events.cpp b/plugins/Folders/src/events.cpp index dae59e6d8f..c3e1d5c941 100644 --- a/plugins/Folders/src/events.cpp +++ b/plugins/Folders/src/events.cpp @@ -18,7 +18,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 "events.h" +#include "commonheaders.h" static HANDLE hPathChanged; diff --git a/plugins/Folders/src/folderItem.cpp b/plugins/Folders/src/folderItem.cpp index fa40d855c9..fe16f30d7a 100644 --- a/plugins/Folders/src/folderItem.cpp +++ b/plugins/Folders/src/folderItem.cpp @@ -18,9 +18,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 "folderItem.h" #include "commonheaders.h" -#include "services.h" CFolderItem::CFolderItem(const char *sectionName, const char *name, const TCHAR *format, const DWORD flags) { diff --git a/plugins/Folders/src/folders.cpp b/plugins/Folders/src/folders.cpp index 586510ae28..638f539143 100644 --- a/plugins/Folders/src/folders.cpp +++ b/plugins/Folders/src/folders.cpp @@ -19,13 +19,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "commonheaders.h" -#include "hooked_events.h" -#include "services.h" -#include "events.h" - -#include "m_folders.h" - -#define MS_FOLDERS_TEST_PLUGIN "Folders/Test/Plugin" char ModuleName[] = "Folders"; HINSTANCE hInstance; @@ -35,15 +28,15 @@ CFoldersList &lstRegisteredFolders = CFoldersList(10); //the list PLUGININFOEX pluginInfo = { sizeof(PLUGININFOEX), - __PLUGIN_DISPLAY_NAME, - VERSION, - __DESC, + __PLUGIN_NAME, + PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), + __DESCRIPTION, __AUTHOR, __AUTHOREMAIL, __COPYRIGHT, __AUTHORWEB, UNICODE_AWARE, - // {2f129563-2c7d-4a9a-b948-97dfcc0afdd7} + // {2F129563-2C7D-4A9A-B948-97DFCC0AFDD7} {0x2f129563, 0x2c7d, 0x4a9a, {0xb9, 0x48, 0x97, 0xdf, 0xcc, 0x0a, 0xfd, 0xd7}} }; diff --git a/plugins/Folders/src/foldersList.cpp b/plugins/Folders/src/foldersList.cpp index b887264541..e003ad81ab 100644 --- a/plugins/Folders/src/foldersList.cpp +++ b/plugins/Folders/src/foldersList.cpp @@ -18,7 +18,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 "foldersList.h" +#include "commonheaders.h" CFoldersList::CFoldersList(int initialSize) { diff --git a/plugins/Folders/src/hooked_events.cpp b/plugins/Folders/src/hooked_events.cpp index 77042f2879..cc939a4e7b 100644 --- a/plugins/Folders/src/hooked_events.cpp +++ b/plugins/Folders/src/hooked_events.cpp @@ -18,19 +18,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 "hooked_events.h" -#include "events.h" - -#define HOST "http://eblis.tla.ro/projects" - -#if defined(WIN64) || defined(_WIN64) -#define FOLDERS_VERSION_URL HOST "/miranda/Folders/updater/x64/Folders.html" -#define FOLDERS_UPDATE_URL HOST "/miranda/Folders/updater/x64/Folders.zip" -#else -#define FOLDERS_VERSION_URL HOST "/miranda/Folders/updater/Folders.html" -#define FOLDERS_UPDATE_URL HOST "/miranda/Folders/updater/Folders.zip" -#endif -#define FOLDERS_VERSION_PREFIX "Custom profile folders version " +#include "commonheaders.h" HANDLE hOptionsInitialize; diff --git a/plugins/Folders/src/services.cpp b/plugins/Folders/src/services.cpp index 4ec1733b79..4178dd49e8 100644 --- a/plugins/Folders/src/services.cpp +++ b/plugins/Folders/src/services.cpp @@ -18,7 +18,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 "services.h" +#include "commonheaders.h" #define DEFAULT_SECTION "Unknown" diff --git a/plugins/Folders/src/stdafx.cpp b/plugins/Folders/src/stdafx.cpp new file mode 100644 index 0000000000..e7e41dae3c --- /dev/null +++ b/plugins/Folders/src/stdafx.cpp @@ -0,0 +1,18 @@ +/* +Copyright (C) 2012-13 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 "commonheaders.h" \ No newline at end of file diff --git a/plugins/Folders/src/utils.cpp b/plugins/Folders/src/utils.cpp index df4131ff84..69d571990f 100644 --- a/plugins/Folders/src/utils.cpp +++ b/plugins/Folders/src/utils.cpp @@ -18,7 +18,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 "utils.h" +#include "commonheaders.h" char *StrCopy(char *source, size_t index, const char *what, size_t count) { diff --git a/plugins/Folders/src/version.h b/plugins/Folders/src/version.h index 6687b0a857..8287ace778 100644 --- a/plugins/Folders/src/version.h +++ b/plugins/Folders/src/version.h @@ -1,45 +1,14 @@ -/* -Custom profile folders plugin for Miranda IM - -Copyright © 2005-2012 Cristian Libotean - -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; either version 2 -of the License, or (at your option) any later version. - -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, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ - -#ifndef M_FOLDERS_VERSION_H -#define M_FOLDERS_VERSION_H - -#define __MAJOR_VERSION 0 -#define __MINOR_VERSION 1 -#define __RELEASE_NUM 6 -#define __BUILD_NUM 1 - -#define VERSION PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM) - -#define __PLUGINVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM -#define __PLUGINVERSION_STRING_DOTS __MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM -#define __STRINGIFY_(x) #x -#define __STRINGIFY(x) __STRINGIFY_(x) -#define __VERSION_STRING __STRINGIFY(__PLUGINVERSION_STRING_DOTS) - -#define __DESC "Service plugin. Allows plugins to save their data to user selected folders; supports variables." -#define __AUTHOR "Cristian Libotean" -#define __AUTHOREMAIL "eblis102@yahoo.com" -#define __COPYRIGHT "© 2005-2012 Cristian Libotean" -#define __AUTHORWEB "http://miranda-ng.org/" -#define __PLUGIN_DISPLAY_NAME "Custom profile folders" - - -#endif //M_FOLDERS_VERSION_H +#define __MAJOR_VERSION 0 +#define __MINOR_VERSION 1 +#define __RELEASE_NUM 6 +#define __BUILD_NUM 1 + +#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM + +#define __PLUGIN_NAME "Custom profile folders" +#define __FILENAME "Folders.dll" +#define __DESCRIPTION "Allows plugins to save their data to user selected folders; supports variables." +#define __AUTHOR "Cristian Libotean" +#define __AUTHOREMAIL "eblis102@yahoo.com" +#define __AUTHORWEB "http://miranda-ng.org/" +#define __COPYRIGHT "© 2005-2012 Cristian Libotean" -- cgit v1.2.3