From 64e5be276b2b883ea354b1efe77d788cfa1a567d Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sun, 27 May 2012 06:40:29 +0000 Subject: projects cleanup git-svn-id: http://svn.miranda-ng.org/main/trunk@192 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/CountryFlags/Info_Src.txt | 32 ---- plugins/CountryFlags/License_Appendix.txt | 64 ------- plugins/CountryFlags/docs/Info_Src.txt | 32 ++++ plugins/CountryFlags/docs/License_Appendix.txt | 64 +++++++ plugins/CountryFlags/flags.def | 11 -- plugins/CountryFlags/flags.vcxproj | 201 ++++++++++++--------- plugins/CountryFlags/flags.vcxproj.filters | 4 +- plugins/Dbx_tree/dbx_tree_10.vcxproj | 2 + plugins/FavContacts/favcontacts.vcxproj | 123 +++++++++---- plugins/FirstRun/FirstRun.vcxproj | 154 ++++------------ plugins/FlashAvatars/FlashAvatars_10.vcxproj | 182 +++++++++++-------- plugins/FloatingContacts/FltCont_10.vcxproj | 139 ++++++++++---- .../FloatingContacts/FltCont_10.vcxproj.filters | 3 - plugins/FloatingContacts/Script.rc | 2 - 14 files changed, 545 insertions(+), 468 deletions(-) delete mode 100644 plugins/CountryFlags/Info_Src.txt delete mode 100644 plugins/CountryFlags/License_Appendix.txt create mode 100644 plugins/CountryFlags/docs/Info_Src.txt create mode 100644 plugins/CountryFlags/docs/License_Appendix.txt delete mode 100644 plugins/CountryFlags/flags.def delete mode 100644 plugins/FloatingContacts/Script.rc (limited to 'plugins') diff --git a/plugins/CountryFlags/Info_Src.txt b/plugins/CountryFlags/Info_Src.txt deleted file mode 100644 index 5c1b19be88..0000000000 --- a/plugins/CountryFlags/Info_Src.txt +++ /dev/null @@ -1,32 +0,0 @@ - -Country Flags Plugin 0.1.0.3 for Miranda IM 0.7+ ------------------------------------------------------------------------- - Source Code - -Reminder: -'Country Flags' is released under the terms of the -GNU General Public License. -See 'Flags-License.txt' for more details. -'Country Flags' is copyright 2006-2007 by H. Herkenrath. - -Please notify me of any changes that improve -'Country Flags' or add new features. -If you have any questions on the code, feel free -to contact me at my email address. - - H. Herkenrath (hrathh at users.sourceforge.net) - - -Notes ------------------------------------------------------------------------- -The following files need to be changed to bump the version number: - -Info_Src.txt (1 place) -version.h (4 places) -m_flags.h (1 place) -m_flags.inc (1 place) -docs\Flags-Readme.txt (3 places) -docs\Flags-Translation.txt (2 or 3 places) -docs\Flags-Developer.txt (1 place) - - diff --git a/plugins/CountryFlags/License_Appendix.txt b/plugins/CountryFlags/License_Appendix.txt deleted file mode 100644 index c590c3f5fb..0000000000 --- a/plugins/CountryFlags/License_Appendix.txt +++ /dev/null @@ -1,64 +0,0 @@ - -Excecpt of GNU General Public License (Appendix): - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. diff --git a/plugins/CountryFlags/docs/Info_Src.txt b/plugins/CountryFlags/docs/Info_Src.txt new file mode 100644 index 0000000000..5c1b19be88 --- /dev/null +++ b/plugins/CountryFlags/docs/Info_Src.txt @@ -0,0 +1,32 @@ + +Country Flags Plugin 0.1.0.3 for Miranda IM 0.7+ +------------------------------------------------------------------------ + Source Code + +Reminder: +'Country Flags' is released under the terms of the +GNU General Public License. +See 'Flags-License.txt' for more details. +'Country Flags' is copyright 2006-2007 by H. Herkenrath. + +Please notify me of any changes that improve +'Country Flags' or add new features. +If you have any questions on the code, feel free +to contact me at my email address. + + H. Herkenrath (hrathh at users.sourceforge.net) + + +Notes +------------------------------------------------------------------------ +The following files need to be changed to bump the version number: + +Info_Src.txt (1 place) +version.h (4 places) +m_flags.h (1 place) +m_flags.inc (1 place) +docs\Flags-Readme.txt (3 places) +docs\Flags-Translation.txt (2 or 3 places) +docs\Flags-Developer.txt (1 place) + + diff --git a/plugins/CountryFlags/docs/License_Appendix.txt b/plugins/CountryFlags/docs/License_Appendix.txt new file mode 100644 index 0000000000..c590c3f5fb --- /dev/null +++ b/plugins/CountryFlags/docs/License_Appendix.txt @@ -0,0 +1,64 @@ + +Excecpt of GNU General Public License (Appendix): + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/plugins/CountryFlags/flags.def b/plugins/CountryFlags/flags.def deleted file mode 100644 index fb2cd5c0ef..0000000000 --- a/plugins/CountryFlags/flags.def +++ /dev/null @@ -1,11 +0,0 @@ -LIBRARY flags BASE=0x24200000 -SECTIONS - ; obfuscated email address - .rdata READ WRITE -EXPORTS - MirandaPluginInfo PRIVATE - Load PRIVATE - Unload PRIVATE - ; v0.8 support - MirandaPluginInfoEx PRIVATE - MirandaPluginInterfaces PRIVATE diff --git a/plugins/CountryFlags/flags.vcxproj b/plugins/CountryFlags/flags.vcxproj index ecc5b700e8..a960f38851 100644 --- a/plugins/CountryFlags/flags.vcxproj +++ b/plugins/CountryFlags/flags.vcxproj @@ -5,26 +5,39 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + - - Flags DynamicLibrary - false + Unicode + true + + + DynamicLibrary Unicode true DynamicLibrary - false + Unicode + + + DynamicLibrary Unicode @@ -34,64 +47,81 @@ + + + + + + + + - - $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ - true - - - $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ - false - true + + <_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 + true + true + true - MultiThreadedDebug - Default + MultiThreadedDebugDLL false Disabled - true - Level4 - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + Level3 + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) _DEBUG;UNICODE;WIN32;_WINDOWS;_USRDLL;STRICT;FLAGS_EXPORTS;%(PreprocessorDefinitions) - _MBCS;NO_STRICT;%(UndefinePreprocessorDefinitions) - true - $(IntDir)$(TargetName).pch + EnableFastChecks + EditAndContinue + + + ..\..\include\msapi + _DEBUG;_UNICODE;UNICODE;%(PreprocessorDefinitions) + + + true + true + Windows + $(IntDir)$(TargetName).lib + 0x24200000 + comctl32.lib;%(AdditionalDependencies) + false + + + + + MultiThreadedDebugDLL + false + Disabled + Level3 + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + _DEBUG;UNICODE;WIN64;_WINDOWS;_USRDLL;STRICT;FLAGS_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks - - true - _DEBUG;%(PreprocessorDefinitions) - .\temp/Debug/Unicode\flags.tlb - true - Win32 - - 0x0809 - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\include\msapi _DEBUG;_UNICODE;UNICODE;%(PreprocessorDefinitions) - - true - $(IntDir)$(TargetName).bsc - true true - Console - uuid.lib;OLDNAMES;%(IgnoreSpecificDefaultLibraries) - flags.def + Windows $(IntDir)$(TargetName).lib 0x24200000 comctl32.lib;%(AdditionalDependencies) - - + false @@ -101,70 +131,63 @@ true true Full - true - Level4 - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + Level3 + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) NDEBUG;UNICODE;WIN32;_WINDOWS;_USRDLL;STRICT;ASSOCMGR_EXPORTS;%(PreprocessorDefinitions) - _MBCS;NO_STRICT;%(UndefinePreprocessorDefinitions) - true - $(IntDir)$(TargetName).pch - /opt:nowin98 Size - - true - NDEBUG;%(PreprocessorDefinitions) - .\temp/Release/Unicode\flags.tlb - false - Win32 - - 0x0809 - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\include\msapi NDEBUG;_UNICODE;UNICODE;%(PreprocessorDefinitions) - - true - $(IntDir)$(TargetName).bsc - - true true true - Console - uuid.lib;OLDNAMES;%(IgnoreSpecificDefaultLibraries) - flags.def + Windows $(IntDir)$(TargetName).lib - true 0x24200000 comctl32.lib;%(AdditionalDependencies) - /ignore:4078 true true + false - - - /opt:ref /opt:nowin98 /opt:ref /opt:nowin98 - - - /opt:ref /opt:nowin98 /opt:ref /opt:nowin98 - - - /opt:ref /opt:nowin98 /opt:ref /opt:nowin98 - - - /opt:ref /opt:nowin98 /opt:ref /opt:nowin98 - - - /opt:ref /opt:nowin98 /opt:ref /opt:nowin98 - - - /opt:ref /opt:nowin98 /opt:ref /opt:nowin98 - - - /opt:ref /opt:nowin98 /opt:ref /opt:nowin98 + + + MultiThreadedDLL + OnlyExplicitInline + true + true + Full + Level3 + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + NDEBUG;UNICODE;WIN64;_WINDOWS;_USRDLL;STRICT;ASSOCMGR_EXPORTS;%(PreprocessorDefinitions) + Size + + ..\..\include\msapi + NDEBUG;_UNICODE;UNICODE;%(PreprocessorDefinitions) + + + true + true + Windows + $(IntDir)$(TargetName).lib + 0x24200000 + comctl32.lib;%(AdditionalDependencies) + true + true + false + + + + + + + + + + @@ -180,8 +203,8 @@ - - + + diff --git a/plugins/CountryFlags/flags.vcxproj.filters b/plugins/CountryFlags/flags.vcxproj.filters index 6c8dd783f4..0b799465fd 100644 --- a/plugins/CountryFlags/flags.vcxproj.filters +++ b/plugins/CountryFlags/flags.vcxproj.filters @@ -76,10 +76,10 @@ Documentation - + Documentation - + Documentation diff --git a/plugins/Dbx_tree/dbx_tree_10.vcxproj b/plugins/Dbx_tree/dbx_tree_10.vcxproj index 61c339ba7d..fbc641c21c 100644 --- a/plugins/Dbx_tree/dbx_tree_10.vcxproj +++ b/plugins/Dbx_tree/dbx_tree_10.vcxproj @@ -82,6 +82,7 @@ Level3 EditAndContinue false + true ..\..\include\msapi @@ -134,6 +135,7 @@ EnableFastChecks MultiThreadedDebugDLL Level3 + true ..\..\include\msapi diff --git a/plugins/FavContacts/favcontacts.vcxproj b/plugins/FavContacts/favcontacts.vcxproj index 02b2890aac..6d1cb138f3 100644 --- a/plugins/FavContacts/favcontacts.vcxproj +++ b/plugins/FavContacts/favcontacts.vcxproj @@ -5,15 +5,21 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {2D0B4CB0-3ACA-4612-B745-FF3050E1500A} - favcontacts - Win32Proj FavContacts @@ -22,44 +28,58 @@ Unicode true + + DynamicLibrary + Unicode + true + DynamicLibrary Unicode + + DynamicLibrary + Unicode + + + + + + + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ - $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ - true - AllRules.ruleset - - - AllRules.ruleset - - + $(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 + true + true + true Disabled - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;FAVCONTACTS_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks - MultiThreadedDebug - - + MultiThreadedDebugDLL Level3 EditAndContinue @@ -68,40 +88,81 @@ true Windows false - - - MachineX86 + $(IntDir)$(TargetName).lib + + + _UNICODE;UNICODE;_DEBUG;%(PreprocessorDefinitions) + ..\..\include\msapi + + + + + Disabled + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + WIN64;_DEBUG;_WINDOWS;_USRDLL;FAVCONTACTS_EXPORTS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Level3 + + + comctl32.lib;%(AdditionalDependencies) + true + Windows + false + $(IntDir)$(TargetName).lib + + _UNICODE;UNICODE;_DEBUG;%(PreprocessorDefinitions) + ..\..\include\msapi + Full Size - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;FAVCONTACTS_EXPORTS;%(PreprocessorDefinitions) - - MultiThreadedDLL false - - Level3 - ProgramDatabase comctl32.lib;%(AdditionalDependencies) Windows true true - - false - - - MachineX86 $(IntDir)$(TargetName).lib true + + _UNICODE;UNICODE;NDEBUG;%(PreprocessorDefinitions) + ..\..\include\msapi + + + + + Full + Size + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + WIN64;NDEBUG;_WINDOWS;_USRDLL;FAVCONTACTS_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDLL + false + Level3 + + + comctl32.lib;%(AdditionalDependencies) + Windows + true + true + false + $(IntDir)$(TargetName).lib + true + + + _UNICODE;UNICODE;NDEBUG;%(PreprocessorDefinitions) + ..\..\include\msapi + diff --git a/plugins/FirstRun/FirstRun.vcxproj b/plugins/FirstRun/FirstRun.vcxproj index 67f8a3173e..ae85b864f2 100644 --- a/plugins/FirstRun/FirstRun.vcxproj +++ b/plugins/FirstRun/FirstRun.vcxproj @@ -24,23 +24,21 @@ DynamicLibrary - false MultiByte DynamicLibrary - false MultiByte DynamicLibrary - false MultiByte + true DynamicLibrary - false MultiByte + true @@ -64,187 +62,101 @@ <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)64/Plugins\ - $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ - $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ - false - false - $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)64/Plugins\ - $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ - $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ - true - true + $(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 + true + true + true - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/FirstRun.tlb - - - Full OnlyExplicitInline - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;FIRSTRUN_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true - MultiThreaded + MultiThreadedDLL true Level3 - true Size - true - - NDEBUG;%(PreprocessorDefinitions) - 0x0419 - - true false - - - MachineX86 true true - UseLinkTimeCodeGeneration $(IntDir)$(TargetName).lib true + comctl32.lib;%(AdditionalDependencies) + Windows - - true - - - NDEBUG;%(PreprocessorDefinitions) - true - true - .\Release/FirstRun.tlb - - - Full OnlyExplicitInline - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;FIRSTRUN_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + WIN64;NDEBUG;_WINDOWS;_USRDLL;FIRSTRUN_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true - MultiThreaded + MultiThreadedDLL true Level3 - true Size - true - - NDEBUG;%(PreprocessorDefinitions) - 0x0419 - - true false - - true true - UseLinkTimeCodeGeneration $(IntDir)$(TargetName).lib true + comctl32.lib;%(AdditionalDependencies) + Windows - - true - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug/FirstRun.tlb - - - Disabled - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;FIRSTRUN_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks - MultiThreadedDebug + MultiThreadedDebugDLL Level3 - true EditAndContinue - - _DEBUG;%(PreprocessorDefinitions) - 0x0419 - - true true false - - - MachineX86 $(IntDir)$(TargetName).lib + comctl32.lib;%(AdditionalDependencies) + Windows - - true - - - _DEBUG;%(PreprocessorDefinitions) - true - true - .\Debug/FirstRun.tlb - - - Disabled - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;FIRSTRUN_EXPORTS;%(PreprocessorDefinitions) + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + WIN64;_DEBUG;_WINDOWS;_USRDLL;FIRSTRUN_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks - MultiThreadedDebug + MultiThreadedDebugDLL Level3 - true - ProgramDatabase - - _DEBUG;%(PreprocessorDefinitions) - 0x0419 - - true true false - - $(IntDir)$(TargetName).lib + comctl32.lib;%(AdditionalDependencies) + Windows - - true - - - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - + diff --git a/plugins/FlashAvatars/FlashAvatars_10.vcxproj b/plugins/FlashAvatars/FlashAvatars_10.vcxproj index 0c6365eacc..765521b7c3 100644 --- a/plugins/FlashAvatars/FlashAvatars_10.vcxproj +++ b/plugins/FlashAvatars/FlashAvatars_10.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + FlashAvatars @@ -17,12 +25,20 @@ DynamicLibrary - false Unicode + true + + + DynamicLibrary + Unicode + true DynamicLibrary - false + Unicode + + + DynamicLibrary Unicode @@ -31,110 +47,138 @@ + + + + + + <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ - true - $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ - false + $(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 + true + true + true - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug_Unicode/FlashAvatars_10.tlb - - - Disabled - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;UNICODE;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks - MultiThreadedDebug + MultiThreadedDebugDLL Use stdafx.h Level3 - true EditAndContinue _DEBUG;%(PreprocessorDefinitions) - 0x0809 + ..\..\include\msapi - comctl32.lib;wsock32.lib;version.lib;%(AdditionalDependencies) - true + comctl32.lib;version.lib;%(AdditionalDependencies) true - true 0x25000000 false - - - MachineX86 $(IntDir)$(TargetName).lib + Windows + + + + + Disabled + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + WIN64;_DEBUG;_WINDOWS;UNICODE;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Use + stdafx.h + Level3 + + + _DEBUG;%(PreprocessorDefinitions) + ..\..\include\msapi + + + comctl32.lib;version.lib;%(AdditionalDependencies) + true + 0x25000000 + false + $(IntDir)$(TargetName).lib + Windows - - true - $(IntDir)$(TargetName).bsc - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release_Unicode/FlashAvatars_10.tlb - - - Full OnlyExplicitInline - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL true Level3 - true - ProgramDatabase Size - true + Use + + + NDEBUG;%(PreprocessorDefinitions) + ..\..\include\msapi + + + /ALIGN:4096 /ignore:4108 %(AdditionalOptions) + comctl32.lib;version.lib;%(AdditionalDependencies) + true + false + $(IntDir)$(TargetName).lib + true + true + Windows + 0x25000000 + + + + + Full + OnlyExplicitInline + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + WIN64;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + Level3 + Size + Use NDEBUG;%(PreprocessorDefinitions) - 0x0417 + ..\..\include\msapi /ALIGN:4096 /ignore:4108 %(AdditionalOptions) - comctl32.lib;wsock32.lib;version.lib;%(AdditionalDependencies) - true + comctl32.lib;version.lib;%(AdditionalDependencies) true - false false - - - MachineX86 $(IntDir)$(TargetName).lib true true - UseLinkTimeCodeGeneration + Windows + 0x25000000 - - true - $(IntDir)$(TargetName).bsc - @@ -143,31 +187,17 @@ - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - + - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) Create + Create + Create + Create - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - + + diff --git a/plugins/FloatingContacts/FltCont_10.vcxproj b/plugins/FloatingContacts/FltCont_10.vcxproj index d3e1efcf47..27f07dc5cc 100644 --- a/plugins/FloatingContacts/FltCont_10.vcxproj +++ b/plugins/FloatingContacts/FltCont_10.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + FltContacts @@ -17,12 +25,20 @@ DynamicLibrary - false Unicode + true + + + DynamicLibrary + Unicode + true DynamicLibrary - false + Unicode + + + DynamicLibrary Unicode @@ -32,82 +48,136 @@ + + + + + + + + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ - true - $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ + $(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 + true + true + true Disabled - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - - EnableFastChecks - MultiThreadedDebug + MultiThreadedDebugDLL Use stdhdr.h - Level4 + Level3 EditAndContinue _DEBUG;%(PreprocessorDefinitions) + ..\..\include\msapi + + + Msimg32.lib;%(AdditionalDependencies) + true + false + $(IntDir)$(TargetName).lib + Windows + + + + + Disabled + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Use + stdhdr.h + Level3 + + + _DEBUG;%(PreprocessorDefinitions) + ..\..\include\msapi Msimg32.lib;%(AdditionalDependencies) - true true false - - - MachineX86 $(IntDir)$(TargetName).lib + Windows Full Size - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - - MultiThreadedDLL - true true Use stdhdr.h - Level4 - ProgramDatabase + Level3 + OnlyExplicitInline + + + NDEBUG;%(PreprocessorDefinitions) + ..\..\include\msapi + + + Msimg32.lib;%(AdditionalDependencies) + true + true + true + false + $(IntDir)$(TargetName).lib + Windows + + + + + Full + Size + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + Use + stdhdr.h + Level3 OnlyExplicitInline - true NDEBUG;%(PreprocessorDefinitions) + ..\..\include\msapi Msimg32.lib;%(AdditionalDependencies) - true true true true false - - - MachineX86 $(IntDir)$(TargetName).lib - UseLinkTimeCodeGeneration + Windows @@ -115,7 +185,9 @@ Create + Create Create + Create @@ -130,15 +202,8 @@ - - true - true - - - - true - true - + + diff --git a/plugins/FloatingContacts/FltCont_10.vcxproj.filters b/plugins/FloatingContacts/FltCont_10.vcxproj.filters index 4b33b8e646..b4bf7a5052 100644 --- a/plugins/FloatingContacts/FltCont_10.vcxproj.filters +++ b/plugins/FloatingContacts/FltCont_10.vcxproj.filters @@ -58,9 +58,6 @@ Resource Files - - Resource Files - Resource Files diff --git a/plugins/FloatingContacts/Script.rc b/plugins/FloatingContacts/Script.rc deleted file mode 100644 index b1bbc9db7b..0000000000 --- a/plugins/FloatingContacts/Script.rc +++ /dev/null @@ -1,2 +0,0 @@ -#include "version.rc" -#include "fltcnt.rc" -- cgit v1.2.3