From 1413991e30852a43155cc4d1c245d44032688978 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sat, 2 Jun 2012 21:21:34 +0000 Subject: projects cleanup mostly finished git-svn-id: http://svn.miranda-ng.org/main/trunk@275 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/SecureIM/secureim_icons_10.vcxproj | 4 - plugins/YAMN/YAMN_10.vcxproj | 113 +-- plugins/YAMN/libs/unicows.lib | Bin 492376 -> 0 bytes plugins/YAPP/popups2_10.vcxproj | 97 +-- .../ZeroNotification/Zero Notification_10.vcxproj | 208 +----- plugins/Zlib/zlib.def | 84 --- plugins/Zlib/zlib_10.vcxproj | 119 +--- protocols/IcqOscarJ/icons_pack/ICONS.vcxproj | 241 +------ .../jabber_xstatus/JABBER_XSTATUS_10.vcxproj | 189 +---- protocols/MRA/xstatus_MRA/xstatus_MRA.vcproj | 786 --------------------- protocols/MRA/xstatus_MRA/xstatus_MRA.vcxproj | 176 +---- protocols/Yahoo/Yahoo_10.vcxproj | 133 +--- 12 files changed, 251 insertions(+), 1899 deletions(-) delete mode 100644 plugins/YAMN/libs/unicows.lib delete mode 100644 plugins/Zlib/zlib.def delete mode 100644 protocols/MRA/xstatus_MRA/xstatus_MRA.vcproj diff --git a/plugins/SecureIM/secureim_icons_10.vcxproj b/plugins/SecureIM/secureim_icons_10.vcxproj index 9f8fec276b..51ad1955e7 100644 --- a/plugins/SecureIM/secureim_icons_10.vcxproj +++ b/plugins/SecureIM/secureim_icons_10.vcxproj @@ -78,7 +78,6 @@ ..\..\include\msapi - true true false Windows @@ -90,7 +89,6 @@ ..\..\include\msapi - true true false Windows @@ -105,7 +103,6 @@ true false Windows - true true true @@ -119,7 +116,6 @@ true false Windows - true true true diff --git a/plugins/YAMN/YAMN_10.vcxproj b/plugins/YAMN/YAMN_10.vcxproj index 917aa4601c..392fff1ec0 100644 --- a/plugins/YAMN/YAMN_10.vcxproj +++ b/plugins/YAMN/YAMN_10.vcxproj @@ -21,29 +21,24 @@ YAMN {C5A87409-F08C-4A07-A8F9-1F5D52BA6D72} - yamn DynamicLibrary - false Unicode true DynamicLibrary - false Unicode DynamicLibrary - false Unicode true DynamicLibrary - false Unicode @@ -51,169 +46,133 @@ - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ - $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ - $(SolutionDir)$(Configuration)64/Plugins\ - $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ - *.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pch%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath)%3b$(TargetDir)$(ProjectName).*%3b$(TargetDir)$(RootNamespace).* - false - $(SolutionDir)$(Configuration)64/Plugins\ - $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ - *.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pch%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath)%3b$(TargetDir)$(ProjectName).*%3b$(TargetDir)$(RootNamespace).* - true - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - true + $(SolutionDir)$(Configuration)\Plugins\ + $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ + $(SolutionDir)$(Configuration)\Plugins\ + $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ + $(SolutionDir)$(Configuration)64\Plugins\ + $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + $(SolutionDir)$(Configuration)64\Plugins\ + $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + true + true + true + true Disabled - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;_USRDLL;_DEBUG;YAMN_DEBUG;%(PreprocessorDefinitions) + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) EnableFastChecks - MultiThreadedDLL - 4Bytes - - + MultiThreadedDebugDLL Level3 EditAndContinue 4996;%(DisableSpecificWarnings) _DEBUG;%(PreprocessorDefinitions) + ..\..\include\msapi - ./libs/unicows.lib;comctl32.lib;ws2_32.lib;%(AdditionalDependencies) + comctl32.lib;ws2_32.lib;%(AdditionalDependencies) true 0x60010000 false - - $(IntDir)$(TargetName).lib - MachineX86 + Windows Full OnlyExplicitInline - Speed - true - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;WIN2IN1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + Size + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - MultiThreadedDLL - 4Bytes true Level3 - ProgramDatabase 4996;%(DisableSpecificWarnings) NDEBUG;%(PreprocessorDefinitions) + ..\..\include\msapi - ./libs/unicows.lib;comctl32.lib;ws2_32.lib;%(AdditionalDependencies) + comctl32.lib;ws2_32.lib;%(AdditionalDependencies) true true - UseLinkTimeCodeGeneration 0x60010000 false - - $(IntDir)$(TargetName).lib - MachineX86 true + Windows Full OnlyExplicitInline - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WIN9X;_USRDLL;%(PreprocessorDefinitions) + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - MultiThreadedDLL true Level3 - ProgramDatabase 4996;%(DisableSpecificWarnings) - Speed + Size NDEBUG;%(PreprocessorDefinitions) - 0x0409 + ..\..\include\msapi - /filealign:512 %(AdditionalOptions) comctl32.lib;ws2_32.lib;%(AdditionalDependencies) true 0x60010000 false - - $(IntDir)$(TargetName).lib - MachineX64 + Windows + true + true - Disabled - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;YAMN_DEBUG;WIN9X;YAMN_VER_BETA;%(PreprocessorDefinitions) + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true EnableFastChecks - MultiThreadedDLL - true + MultiThreadedDebugDLL Level3 - ProgramDatabase 4996;%(DisableSpecificWarnings) _DEBUG;%(PreprocessorDefinitions) - 0x0409 + ..\..\include\msapi comctl32.lib;ws2_32.lib;%(AdditionalDependencies) true 0x60010000 false - - $(IntDir)$(TargetName).lib - MachineX64 + Windows - diff --git a/plugins/YAMN/libs/unicows.lib b/plugins/YAMN/libs/unicows.lib deleted file mode 100644 index 9ef8bbd665..0000000000 Binary files a/plugins/YAMN/libs/unicows.lib and /dev/null differ diff --git a/plugins/YAPP/popups2_10.vcxproj b/plugins/YAPP/popups2_10.vcxproj index bca9ea3bbe..50e198674d 100644 --- a/plugins/YAPP/popups2_10.vcxproj +++ b/plugins/YAPP/popups2_10.vcxproj @@ -21,7 +21,6 @@ YAPP {B6FC188B-8E54-4197-9444-8BADE9AA75E2} - yapp @@ -60,40 +59,43 @@ <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ + $(SolutionDir)$(Configuration)\Plugins\ + $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ true - $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ - $(SolutionDir)$(Configuration)64/Plugins\ - $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ - $(SolutionDir)$(Configuration)64/Plugins\ - $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ + $(SolutionDir)$(Configuration)\Plugins\ + $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ + $(SolutionDir)$(Configuration)64\Plugins\ + $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + $(SolutionDir)$(Configuration)64\Plugins\ + $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + true + true + true Disabled - ./docs;../../include;../ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;_UNICODE;UNICODE;%(PreprocessorDefinitions) + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks - MultiThreadedDebug - true + MultiThreadedDebugDLL common.h Level3 EditAndContinue 4996;%(DisableSpecificWarnings) + Use - unicows.lib;comctl32.lib;%(AdditionalDependencies) true Windows false - - $(IntDir)$(TargetName).lib - MachineX86 + + _DEBUG;%(PreprocessorDefinitions) + ..\..\include\msapi + @@ -101,78 +103,79 @@ OnlyExplicitInline true Size - true - ./docs;../../include;../ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;_UNICODE;UNICODE;MICROSOFT_LAYER_FOR_UNICODE=1;%(PreprocessorDefinitions) + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;%(PreprocessorDefinitions) true - - - MultiThreadedDLL false Fast - false common.h Level3 - ProgramDatabase 4996;%(DisableSpecificWarnings) + Use - comctl32.lib;%(AdditionalDependencies) - Kernel32.lib Advapi32.lib User32.lib Gdi32.lib Shell32.lib Comdlg32.lib Version.lib Mpr.lib Rasapi32.lib Winmm.lib Winspool.lib Vfw32.lib Secur32.lib Oleacc.lib Oledlg.lib Sensapi.lib;%(IgnoreSpecificDefaultLibraries) true Windows true true false $(IntDir)$(TargetName).lib - MachineX86 + + NDEBUG;%(PreprocessorDefinitions) + ..\..\include\msapi + - MultiThreadedDLL Full OnlyExplicitInline true Size - false - ./docs;../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) WIN64;NDEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;%(PreprocessorDefinitions) true + Level3 + Use + common.h true - - true $(IntDir)$(TargetName).lib true Windows - - + false + + NDEBUG;%(PreprocessorDefinitions) + ..\..\include\msapi + EnableFastChecks - - - - - MultiThreadedDebug - ./docs;../../include;../ExternalAPI;%(AdditionalIncludeDirectories) - WIN64;_DEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;_UNICODE;UNICODE;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + WIN64;_DEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;%(PreprocessorDefinitions) Disabled + Level3 + Use + common.h $(IntDir)$(TargetName).lib + false + true + Windows + + _DEBUG;%(PreprocessorDefinitions) + ..\..\include\msapi + - - WIN32;_DEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;_UNICODE;UNICODE;%(PreprocessorDefinitions) - WIN32;_DEBUG;_WINDOWS;_USRDLL;POPUPS2_EXPORTS;_UNICODE;UNICODE;%(PreprocessorDefinitions) - + @@ -180,6 +183,8 @@ Create Create + Create + Create diff --git a/plugins/ZeroNotification/Zero Notification_10.vcxproj b/plugins/ZeroNotification/Zero Notification_10.vcxproj index 517ac96c2e..30d0c102b9 100644 --- a/plugins/ZeroNotification/Zero Notification_10.vcxproj +++ b/plugins/ZeroNotification/Zero Notification_10.vcxproj @@ -21,29 +21,24 @@ ZeroNotify {E37561EB-B9C5-4215-9FF9-DB559916FBA2} - avs DynamicLibrary - false Unicode true DynamicLibrary - false Unicode true DynamicLibrary - false Unicode DynamicLibrary - false Unicode @@ -64,256 +59,129 @@ <_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 - $(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 - $(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(SolutionDir)\..\SVN\Miranda\Trunk\miranda\include - $(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(SolutionDir)\..\SVN\Miranda\Trunk\miranda\include - false - false - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug_Unicode/avatars.tlb - - - Disabled - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;LOADAVATARS_EXPORTS;%(PreprocessorDefinitions) + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) false true EnableFastChecks - MultiThreadedDebug + MultiThreadedDebugDLL false Fast - - - - - - - - Level3 - true EditAndContinue - CompileAsC + 4996;%(DisableSpecificWarnings) - _DEBUG;UNICODE;%(PreprocessorDefinitions) - 0x0809 + _DEBUG;%(PreprocessorDefinitions) + ..\..\include\msapi - comctl32.lib;msimg32.lib;%(AdditionalDependencies) - true true - false - - - - - - + false $(IntDir)$(TargetName).lib - MachineX86 + Windows + 0x5130000 - - _DEBUG;%(PreprocessorDefinitions) - true - true - .\Debug_Unicode/avatars.tlb - - - Disabled - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;LOADAVATARS_EXPORTS;%(PreprocessorDefinitions) + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) false EnableFastChecks - MultiThreadedDebug + MultiThreadedDebugDLL false Fast - - - - - - - - Level3 - true - ProgramDatabase - CompileAsC + 4996;%(DisableSpecificWarnings) - _DEBUG;UNICODE;%(PreprocessorDefinitions) - 0x0809 + _DEBUG;%(PreprocessorDefinitions) + ..\..\include\msapi - comctl32.lib;msimg32.lib;%(AdditionalDependencies) - true true - false - - - - - - + false $(IntDir)$(TargetName).lib + Windows + 0x5130000 - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release_Unicode/avatars.tlb - - - Full OnlyExplicitInline - false Size - false - false - true - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;UNICODE;_USRDLL;LOADAVATARS_EXPORTS;%(PreprocessorDefinitions) + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true false - MultiThreadedDLL false false - NotSet Fast - false - - - commonheaders.h - - - false Level3 - true - ProgramDatabase - CompileAsC 4996;%(DisableSpecificWarnings) true - false - false - NDEBUG;UNICODE;%(PreprocessorDefinitions) - 0x0809 + NDEBUG;%(PreprocessorDefinitions) + ..\..\include\msapi - /IGNORE:4089 /filealign:512 %(AdditionalOptions) - comctl32.lib;msimg32.lib;%(AdditionalDependencies) true true true - UseLinkTimeCodeGeneration 0x5130000 - true - - + false $(IntDir)$(TargetName).lib - MachineX86 - false - false + Windows - - $(IntDir)$(TargetName).xml - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - .\Release_Unicode/avatars.tlb - - - Full OnlyExplicitInline - false Size - false - false - true - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;UNICODE;_USRDLL;LOADAVATARS_EXPORTS;%(PreprocessorDefinitions) + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true false - MultiThreadedDLL false false - NotSet Fast - false - - - commonheaders.h - - - false Level3 - true - ProgramDatabase - CompileAsC 4996;%(DisableSpecificWarnings) - false - false - NDEBUG;UNICODE;%(PreprocessorDefinitions) - 0x0809 + NDEBUG;%(PreprocessorDefinitions) + ..\..\include\msapi - /IGNORE:4089 /filealign:512 %(AdditionalOptions) - comctl32.lib;msimg32.lib;%(AdditionalDependencies) true true true - UseLinkTimeCodeGeneration 0x5130000 - true - - + false $(IntDir)$(TargetName).lib - false - false + Windows - - $(IntDir)$(TargetName).xml - - diff --git a/plugins/Zlib/zlib.def b/plugins/Zlib/zlib.def deleted file mode 100644 index 04896150e4..0000000000 --- a/plugins/Zlib/zlib.def +++ /dev/null @@ -1,84 +0,0 @@ -; zlib data compression library -EXPORTS -; basic functions - zlibVersion - deflate - deflateEnd - inflate - inflateEnd -; advanced functions - deflateSetDictionary - deflateCopy - deflateReset - deflateParams - deflateTune - deflateBound - deflatePending - deflatePrime - deflateSetHeader - inflateSetDictionary - inflateSync - inflateCopy - inflateReset - inflateReset2 - inflatePrime - inflateMark - inflateGetHeader - inflateBack - inflateBackEnd - zlibCompileFlags -; utility functions - compress - compress2 - compressBound - uncompress - gzopen - gzdopen - gzbuffer - gzsetparams - gzread - gzwrite - gzprintf - gzputs - gzgets - gzputc - gzgetc - gzungetc - gzflush - gzseek - gzrewind - gztell - gzoffset - gzeof - gzdirect - gzclose - gzclose_r - gzclose_w - gzerror - gzclearerr -; large file functions - gzopen64 - gzseek64 - gztell64 - gzoffset64 - adler32_combine64 - crc32_combine64 -; checksum functions - adler32 - crc32 - adler32_combine - crc32_combine -; various hacks, don't look :) - deflateInit_ - deflateInit2_ - inflateInit_ - inflateInit2_ - inflateBackInit_ - gzgetc_ - zError - inflateSyncPoint - get_crc_table - inflateUndermine - inflateResetKeep - deflateResetKeep - gzopen_w diff --git a/plugins/Zlib/zlib_10.vcxproj b/plugins/Zlib/zlib_10.vcxproj index 9a04f60950..117f9f6154 100644 --- a/plugins/Zlib/zlib_10.vcxproj +++ b/plugins/Zlib/zlib_10.vcxproj @@ -21,22 +21,25 @@ Zlib {E2A369CD-EDA3-414F-8AD0-E732CD7EE68C} - zlib DynamicLibrary true + Unicode DynamicLibrary + Unicode DynamicLibrary true + Unicode DynamicLibrary + Unicode @@ -57,174 +60,115 @@ <_ProjectFileVersion>10.0.30128.1 $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ + $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ $(SolutionDir)$(Configuration)64\ - $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ + $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ $(SolutionDir)$(Configuration)\ - $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ + $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ $(SolutionDir)$(Configuration)64\ - $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - + $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + true + true + true + true - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug/zlib.tlb - - - Disabled - ../../include;%(AdditionalIncludeDirectories) + ..\..\include;%(AdditionalIncludeDirectories) EnableFastChecks MultiThreadedDebugDLL true Level3 EditAndContinue 4996;%(DisableSpecificWarnings) + WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) _DEBUG;%(PreprocessorDefinitions) - 0x0419 + ..\..\include\msapi - .\zlib.def true false $(IntDir)$(TargetName).lib - MachineX86 + Windows - - _DEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Debug/zlib.tlb - - - Disabled - ../../include;%(AdditionalIncludeDirectories) + ..\..\include;%(AdditionalIncludeDirectories) EnableFastChecks MultiThreadedDebugDLL true Level3 - ProgramDatabase 4996;%(DisableSpecificWarnings) + WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) _DEBUG;%(PreprocessorDefinitions) - 0x0419 + ..\..\include\msapi - %(AdditionalManifestDependencies) - .\zlib.def true false $(IntDir)$(TargetName).lib - MachineX64 + Windows - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/zlib.tlb - - - Full OnlyExplicitInline Size - true - ../../include;%(AdditionalIncludeDirectories) + ..\..\include;%(AdditionalIncludeDirectories) true false - MultiThreadedDLL true Level3 - ProgramDatabase - 4996;4100;4127;4131;4244;%(DisableSpecificWarnings) + 4996;%(DisableSpecificWarnings) true - false + WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) NDEBUG;%(PreprocessorDefinitions) - 0x0419 + ..\..\include\msapi - /filealign:512 %(AdditionalOptions) - type=%27Win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27X86%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies) - .\zlib.def true true true - UseLinkTimeCodeGeneration false $(IntDir)$(TargetName).lib - MachineX86 + Windows - - NDEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Release/zlib.tlb - - - Full OnlyExplicitInline Size - true - ../../include;%(AdditionalIncludeDirectories) + ..\..\include;%(AdditionalIncludeDirectories) true false - MultiThreadedDLL true Level3 - ProgramDatabase - 4996;4100;4127;4131;4244;%(DisableSpecificWarnings) + 4996;%(DisableSpecificWarnings) true - false + WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) NDEBUG;%(PreprocessorDefinitions) - 0x0419 + ..\..\include\msapi - %(AdditionalManifestDependencies) - .\zlib.def true true true - UseLinkTimeCodeGeneration false $(IntDir)$(TargetName).lib - MachineX64 + Windows @@ -255,9 +199,6 @@ - - - diff --git a/protocols/IcqOscarJ/icons_pack/ICONS.vcxproj b/protocols/IcqOscarJ/icons_pack/ICONS.vcxproj index bab72bd441..50ba18b005 100644 --- a/protocols/IcqOscarJ/icons_pack/ICONS.vcxproj +++ b/protocols/IcqOscarJ/icons_pack/ICONS.vcxproj @@ -19,18 +19,16 @@ - - xStatus_ICQ DynamicLibrary - MultiByte + Unicode DynamicLibrary - MultiByte + Unicode DynamicLibrary @@ -60,257 +58,70 @@ - - $(SolutionDir)$(Configuration)\Icons\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - - - $(SolutionDir)$(Configuration)64\Icons\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - - - $(SolutionDir)$(Configuration)\Icons\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - - - $(SolutionDir)$(Configuration)64\Icons\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + + <_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 + true + true + true - - MultiThreaded - Default - false - Disabled - true - Level3 - WIN32;NDEBUG;_WINDOWS;_USRDLL;ICONS_EXPORTS;%(PreprocessorDefinitions) - .\Release\ - .\Release\ICONS.pch - Use - stdafx.h - .\Release\ - .\Release\ - - - true - .\Release\ICONS.tlb - Win32 - - 0x0409 + _DEBUG;%(PreprocessorDefinitions) - - true - .\Release\ICONS.bsc - true Windows true - /ALIGN:4096 /ignore:4108 - false + false - - MultiThreaded - Default - false - Disabled - true - Level3 - WIN32;NDEBUG;_WINDOWS;_USRDLL;ICONS_EXPORTS;%(PreprocessorDefinitions) - .\Release\ - .\Release\ICONS.pch - Use - stdafx.h - .\Release\ - .\Release\ - - - true - .\Release\ICONS.tlb - - 0x0409 + _DEBUG;%(PreprocessorDefinitions) - - true - .\Release\ICONS.bsc - true Windows true - /ALIGN:4096 /ignore:4108 - false + false - - MultiThreaded - Default - false - Disabled - true - Level3 - WIN32;NDEBUG;_WINDOWS;_USRDLL;ICONS_EXPORTS;%(PreprocessorDefinitions) - .\Release\ - .\Release\ICONS.pch - Use - stdafx.h - .\Release\ - .\Release\ - - - true - .\Release\ICONS.tlb - Win32 - - 0x0409 + NDEBUG;%(PreprocessorDefinitions) - - true - .\Release\ICONS.bsc - true Windows true - /ALIGN:4096 /ignore:4108 - false + + + false - - MultiThreaded - Default - false - Disabled - true - Level3 - WIN32;NDEBUG;_WINDOWS;_USRDLL;ICONS_EXPORTS;%(PreprocessorDefinitions) - .\Release\ - .\Release\ICONS.pch - Use - stdafx.h - .\Release\ - .\Release\ - - - true - .\Release\ICONS.tlb - - 0x0409 + NDEBUG;%(PreprocessorDefinitions) - - true - .\Release\ICONS.bsc - true Windows true - /ALIGN:4096 /ignore:4108 - false + false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/protocols/JabberG/jabber_xstatus/JABBER_XSTATUS_10.vcxproj b/protocols/JabberG/jabber_xstatus/JABBER_XSTATUS_10.vcxproj index 730a374928..3d36451f08 100644 --- a/protocols/JabberG/jabber_xstatus/JABBER_XSTATUS_10.vcxproj +++ b/protocols/JabberG/jabber_xstatus/JABBER_XSTATUS_10.vcxproj @@ -19,29 +19,23 @@ - - xStatus_Jabber DynamicLibrary - false - MultiByte + Unicode DynamicLibrary - false - MultiByte + Unicode DynamicLibrary - false Unicode DynamicLibrary - false Unicode @@ -64,190 +58,63 @@ - - $(SolutionDir)$(Configuration)\Icons\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - false - true - - - $(SolutionDir)$(Configuration)64\Icons\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - false - true - - - $(SolutionDir)$(Configuration)\Icons\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - false - true - - - $(SolutionDir)$(Configuration)64\Icons\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - false - true + + <_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 + true + true + true - - MultiThreaded - Default - false - Disabled - true - true - Level3 - WIN32;NDEBUG;_WINDOWS;_USRDLL;JABBER_XSTATUS_EXPORTS;%(PreprocessorDefinitions) - .\Release\ - .\Release\JABBER_XSTATUS.pch - Use - stdafx.h - .\Release\ - .\Release\ - - - true - .\Release\JABBER_XSTATUS.tlb - Win32 - - 0x0409 + _DEBUG;%(PreprocessorDefinitions) - - true - .\Release\JABBER_XSTATUS.bsc - - true true - false - Console - true - - + Windows true - /ALIGN:4096 /ignore:4108 + false - - MultiThreaded - Default - false - Disabled - true - true - Level3 - WIN32;NDEBUG;_WINDOWS;_USRDLL;JABBER_XSTATUS_EXPORTS;%(PreprocessorDefinitions) - .\Release\ - .\Release\JABBER_XSTATUS.pch - Use - stdafx.h - .\Release\ - .\Release\ - - - true - .\Release\JABBER_XSTATUS.tlb - - 0x0409 + _DEBUG;%(PreprocessorDefinitions) - - true - .\Release\JABBER_XSTATUS.bsc - - true true - false - Console - true - - + Windows true - /ALIGN:4096 /ignore:4108 + false - - MultiThreaded - Default - false - Disabled - true - true - Level3 - WIN32;NDEBUG;_WINDOWS;_USRDLL;JABBER_XSTATUS_EXPORTS;%(PreprocessorDefinitions) - .\Release\ - .\Release\JABBER_XSTATUS.pch - Use - stdafx.h - .\Release\ - .\Release\ - - - true - .\Release\JABBER_XSTATUS.tlb - Win32 - - 0x0409 + NDEBUG;%(PreprocessorDefinitions) - - true - .\Release\JABBER_XSTATUS.bsc - - true true - false - Console - true - - + Windows true - /ALIGN:4096 /ignore:4108 + false - - MultiThreaded - Default - false - Disabled - true - true - Level3 - WIN32;NDEBUG;_WINDOWS;_USRDLL;JABBER_XSTATUS_EXPORTS;%(PreprocessorDefinitions) - .\Release\ - .\Release\JABBER_XSTATUS.pch - Use - stdafx.h - .\Release\ - .\Release\ - - - true - .\Release\JABBER_XSTATUS.tlb - - 0x0409 + NDEBUG;%(PreprocessorDefinitions) - - true - .\Release\JABBER_XSTATUS.bsc - - true true - false - Console - true - - + Windows true - /ALIGN:4096 /ignore:4108 + false diff --git a/protocols/MRA/xstatus_MRA/xstatus_MRA.vcproj b/protocols/MRA/xstatus_MRA/xstatus_MRA.vcproj deleted file mode 100644 index 09e0b70f84..0000000000 --- a/protocols/MRA/xstatus_MRA/xstatus_MRA.vcproj +++ /dev/null @@ -1,786 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/protocols/MRA/xstatus_MRA/xstatus_MRA.vcxproj b/protocols/MRA/xstatus_MRA/xstatus_MRA.vcxproj index 94103c195a..187c1b8a65 100644 --- a/protocols/MRA/xstatus_MRA/xstatus_MRA.vcxproj +++ b/protocols/MRA/xstatus_MRA/xstatus_MRA.vcxproj @@ -20,24 +20,23 @@ {5B84781D-F1C3-4535-99B7-B84B6C9BCF15} - Win32Proj DynamicLibrary - MultiByte + Unicode DynamicLibrary - MultiByte + Unicode DynamicLibrary - MultiByte + Unicode DynamicLibrary - MultiByte + Unicode @@ -63,195 +62,60 @@ <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)$(Configuration)\Icons\ $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - true $(SolutionDir)$(Configuration)64\Icons\ $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true $(SolutionDir)$(Configuration)\Icons\ $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - false $(SolutionDir)$(Configuration)64\Icons\ $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - false + true + true + true + true - - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;XSTATUS_MRA_EXPORTS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - - - Level3 - EditAndContinue - - $(OutDir)xstatus_MRA.dll - - Windows true - false false - - - true - $(OutDir)xstatus_MRA.lib - MachineX86 + + _DEBUG;%(PreprocessorDefinitions) + - - X64 - - - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;XSTATUS_MRA_EXPORTS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - - - Level3 - ProgramDatabase - - $(OutDir)xstatus_MRA.dll - - Windows true - false false - - - true - $(OutDir)xstatus_MRA.lib - MachineX64 + + _DEBUG;%(PreprocessorDefinitions) + - - MaxSpeed - OnlyExplicitInline - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;XSTATUS_MRA_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreaded - true - - - Level3 - ProgramDatabase - - $(OutDir)xstatus_MRA.dll Windows - true - true true - true false - - - true - $(OutDir)xstatus_MRA.lib - MachineX86 - - + + NDEBUG;%(PreprocessorDefinitions) + - - X64 - - - MaxSpeed - OnlyExplicitInline - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;XSTATUS_MRA_EXPORTS;%(PreprocessorDefinitions) - true - MultiThreaded - true - - - Level3 - ProgramDatabase - - $(OutDir)xstatus_MRA.dll Windows - true - true true - true false - - - true - $(OutDir)xstatus_MRA.lib - MachineX64 - - + + NDEBUG;%(PreprocessorDefinitions) + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/protocols/Yahoo/Yahoo_10.vcxproj b/protocols/Yahoo/Yahoo_10.vcxproj index 8f437d45c7..d934f3356d 100644 --- a/protocols/Yahoo/Yahoo_10.vcxproj +++ b/protocols/Yahoo/Yahoo_10.vcxproj @@ -21,29 +21,24 @@ Yahoo {E42870DB-9FED-44E7-9C93-4E64D0C87F51} - Yahoo DynamicLibrary - false Unicode true DynamicLibrary - false Unicode DynamicLibrary - false Unicode true DynamicLibrary - false Unicode @@ -64,227 +59,143 @@ <_ProjectFileVersion>10.0.30128.1 - $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ + $(SolutionDir)$(Configuration)\Plugins\ + $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ true - $(SolutionDir)$(Configuration)64/Plugins\ - $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ + $(SolutionDir)$(Configuration)64\Plugins\ + $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ true - $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ + $(SolutionDir)$(Configuration)\Plugins\ + $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ true - $(SolutionDir)$(Configuration)64/Plugins\ - $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ + $(SolutionDir)$(Configuration)64\Plugins\ + $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ true - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug/Yahoo.tlb - - - Disabled - ../../include;../../plugins/ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;YAHOO_EXPORTS;HAVE_CONFIG_H;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL true - Precise Use yahoo.h - - Level3 - true EditAndContinue 4996;%(DisableSpecificWarnings) _DEBUG;%(PreprocessorDefinitions) - 0x0419 - ./../../include/msapi/ + ..\..\include\msapi ws2_32.lib;%(AdditionalDependencies) - true true - $(TargetDir)$(TargetName).pdb false $(IntDir)$(TargetName).lib - MachineX86 + Windows ..\..\bin10\make_ver.bat - - _DEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Debug/Yahoo.tlb - - - Disabled - ../../include;../../plugins/ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;YAHOO_EXPORTS;HAVE_CONFIG_H;%(PreprocessorDefinitions) + ..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories) + WIN64;_DEBUG;_WINDOWS;_USRDLL;YAHOO_EXPORTS;HAVE_CONFIG_H;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL true - Precise Use yahoo.h - - Level3 - true - ProgramDatabase 4996;%(DisableSpecificWarnings) _DEBUG;%(PreprocessorDefinitions) - 0x0419 - ./../../include/msapi/ + ..\..\include\msapi ws2_32.lib;%(AdditionalDependencies) - true - %(AdditionalManifestDependencies) true - $(TargetDir)$(TargetName).pdb false $(IntDir)$(TargetName).lib - MachineX64 + Windows ..\..\bin10\make_ver.bat - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/Yahoo.tlb - - - Full OnlyExplicitInline true Size - true - ../../include;../../plugins/ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;YAHOO_EXPORTS;%(PreprocessorDefinitions) true false - MultiThreadedDLL false true Fast - false Use yahoo.h - - Level3 - true - ProgramDatabase 4996;%(DisableSpecificWarnings) NDEBUG;%(PreprocessorDefinitions) - 0x0419 - ./../../include/msapi/ + ..\..\include\msapi ws2_32.lib;%(AdditionalDependencies) - type=%27Win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27X86%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies) true true true - UseLinkTimeCodeGeneration false $(IntDir)$(TargetName).lib - MachineX86 + Windows ..\..\bin10\make_ver.bat - - NDEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Release/Yahoo.tlb - - - Full OnlyExplicitInline true Size - true - ../../include;../../plugins/ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;YAHOO_EXPORTS;%(PreprocessorDefinitions) + ..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories) + WIN64;NDEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;YAHOO_EXPORTS;%(PreprocessorDefinitions) true false - MultiThreadedDLL false true Fast - false Use yahoo.h - - Level3 - true - ProgramDatabase 4996;%(DisableSpecificWarnings) NDEBUG;%(PreprocessorDefinitions) - 0x0419 - ./../../include/msapi/ + ..\..\include\msapi ws2_32.lib;%(AdditionalDependencies) - %(AdditionalManifestDependencies) true true true - UseLinkTimeCodeGeneration false $(IntDir)$(TargetName).lib - MachineX64 + Windows ..\..\bin10\make_ver.bat -- cgit v1.2.3