From 4a8d7c10bc12e1e6fd2bd42d1727d7ef4d9612a2 Mon Sep 17 00:00:00 2001 From: watcherhd Date: Tue, 29 Nov 2011 23:12:14 +0000 Subject: another part of small project fixes and x64 adaptation in some cases git-svn-id: http://miranda-plugins.googlecode.com/svn/trunk@231 e753b5eb-9565-29b2-b5c5-2cc6f99dfbcb --- ZeroNotification/Zero Notification_10.sln | 16 +- ZeroNotification/Zero Notification_10.vcxproj | 312 ++++++++++++++++++++++++-- ZeroNotification/Zero Notification_9.vcproj | 8 +- 3 files changed, 315 insertions(+), 21 deletions(-) (limited to 'ZeroNotification') diff --git a/ZeroNotification/Zero Notification_10.sln b/ZeroNotification/Zero Notification_10.sln index 973f74b..bd549e9 100644 --- a/ZeroNotification/Zero Notification_10.sln +++ b/ZeroNotification/Zero Notification_10.sln @@ -1,23 +1,35 @@ Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZeroNotifyW", "Zero Notification_10.vcxproj", "{E37561EB-B9C5-4215-9FF9-DB559916FBA2}" +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZeroNotify", "Zero Notification_10.vcxproj", "{E37561EB-B9C5-4215-9FF9-DB559916FBA2}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug Unicode|Win32 = Debug Unicode|Win32 + Debug Unicode|x64 = Debug Unicode|x64 Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release Unicode|Win32 = Release Unicode|Win32 + Release Unicode|x64 = Release Unicode|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {E37561EB-B9C5-4215-9FF9-DB559916FBA2}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32 {E37561EB-B9C5-4215-9FF9-DB559916FBA2}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32 + {E37561EB-B9C5-4215-9FF9-DB559916FBA2}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64 + {E37561EB-B9C5-4215-9FF9-DB559916FBA2}.Debug Unicode|x64.Build.0 = Debug Unicode|x64 {E37561EB-B9C5-4215-9FF9-DB559916FBA2}.Debug|Win32.ActiveCfg = Debug|Win32 {E37561EB-B9C5-4215-9FF9-DB559916FBA2}.Debug|Win32.Build.0 = Debug|Win32 + {E37561EB-B9C5-4215-9FF9-DB559916FBA2}.Debug|x64.ActiveCfg = Debug|x64 + {E37561EB-B9C5-4215-9FF9-DB559916FBA2}.Debug|x64.Build.0 = Debug|x64 {E37561EB-B9C5-4215-9FF9-DB559916FBA2}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32 {E37561EB-B9C5-4215-9FF9-DB559916FBA2}.Release Unicode|Win32.Build.0 = Release Unicode|Win32 + {E37561EB-B9C5-4215-9FF9-DB559916FBA2}.Release Unicode|x64.ActiveCfg = Release Unicode|x64 + {E37561EB-B9C5-4215-9FF9-DB559916FBA2}.Release Unicode|x64.Build.0 = Release Unicode|x64 {E37561EB-B9C5-4215-9FF9-DB559916FBA2}.Release|Win32.ActiveCfg = Release|Win32 {E37561EB-B9C5-4215-9FF9-DB559916FBA2}.Release|Win32.Build.0 = Release|Win32 + {E37561EB-B9C5-4215-9FF9-DB559916FBA2}.Release|x64.ActiveCfg = Release|x64 + {E37561EB-B9C5-4215-9FF9-DB559916FBA2}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/ZeroNotification/Zero Notification_10.vcxproj b/ZeroNotification/Zero Notification_10.vcxproj index 427edad..0a1b608 100644 --- a/ZeroNotification/Zero Notification_10.vcxproj +++ b/ZeroNotification/Zero Notification_10.vcxproj @@ -5,18 +5,34 @@ Debug Unicode Win32 + + Debug Unicode + x64 + Debug Win32 + + Debug + x64 + Release Unicode Win32 + + Release Unicode + x64 + Release Win32 + + Release + x64 + ZeroNotify @@ -30,56 +46,106 @@ MultiByte true + + DynamicLibrary + false + MultiByte + true + DynamicLibrary false Unicode true + + DynamicLibrary + false + Unicode + true + DynamicLibrary false MultiByte + + DynamicLibrary + false + MultiByte + DynamicLibrary false Unicode + + DynamicLibrary + false + Unicode + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 $(SolutionDir)$(Configuration)/Plugins\ + $(SolutionDir)\$(Configuration) $(Platform)/Plugins\ $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)/Obj/$(ProjectName)\ true + true $(SolutionDir)$(Configuration)/Plugins\ + $(SolutionDir)\$(Configuration) $(Platform)/Plugins\ $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)/Obj/$(ProjectName)\ true + true $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)/Obj\$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)/Plugins\ + $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)/Obj/$(ProjectName)\ true + true $(SolutionDir)$(Configuration)/Plugins\ + $(SolutionDir)\$(Configuration) $(Platform)/Plugins\ $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)/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 $(ProjectName)W + $(ProjectName)W $(ProjectName)W + $(ProjectName)W @@ -93,12 +159,12 @@ Disabled - ../../include;%(AdditionalIncludeDirectories) + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;LOADAVATARS_EXPORTS;%(PreprocessorDefinitions) false true EnableFastChecks - MultiThreadedDebugDLL + MultiThreadedDebug false Fast @@ -134,6 +200,56 @@ MachineX86 + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\Debug_Unicode/avatars.tlb + + + + + Disabled + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;LOADAVATARS_EXPORTS;%(PreprocessorDefinitions) + false + EnableFastChecks + MultiThreadedDebug + false + Fast + + + + + + + + + Level3 + true + ProgramDatabase + CompileAsC + + + _DEBUG;UNICODE;%(PreprocessorDefinitions) + 0x0809 + + + comctl32.lib;msimg32.lib;%(AdditionalDependencies) + true + true + $(TargetDir)$(TargetName).pdb + false + + + + + + + $(IntDir)$(TargetName).lib + + _DEBUG;%(PreprocessorDefinitions) @@ -146,11 +262,11 @@ Disabled - ../../include;%(AdditionalIncludeDirectories) + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;LOADAVATARS_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks - MultiThreadedDebugDLL + MultiThreadedDebug true Fast @@ -183,6 +299,52 @@ MachineX86 + + + _DEBUG;%(PreprocessorDefinitions) + true + true + .\Debug/avatars.tlb + + + + + Disabled + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;LOADAVATARS_EXPORTS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + true + Fast + + + commonheaders.h + + + + + Level3 + true + ProgramDatabase + 4996;%(DisableSpecificWarnings) + + + _DEBUG;%(PreprocessorDefinitions) + 0x0809 + + + comctl32.lib;msimg32.lib;%(AdditionalDependencies) + true + true + false + + + false + + + $(IntDir)$(TargetName).lib + + NDEBUG;%(PreprocessorDefinitions) @@ -194,14 +356,14 @@ - MinSpace - Disabled + Full + OnlyExplicitInline false Size false false true - ../../include;%(AdditionalIncludeDirectories) + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;UNICODE;_USRDLL;LOADAVATARS_EXPORTS;%(PreprocessorDefinitions) true false @@ -233,7 +395,6 @@ /IGNORE:4089 /filealign:512 %(AdditionalOptions) comctl32.lib;msimg32.lib;%(AdditionalDependencies) - $(OutDir)$(TargetName)$(TargetExt) true $(IntDir)$(TargetName).pdb true @@ -251,9 +412,73 @@ $(IntDir)$(TargetName).xml - - $(IntDir)$(TargetName).bsc - + + + + + 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) + true + false + MultiThreaded + false + false + NotSet + Fast + false + + + commonheaders.h + + + false + Level3 + true + ProgramDatabase + CompileAsC + 4996;%(DisableSpecificWarnings) + false + false + + + NDEBUG;UNICODE;%(PreprocessorDefinitions) + 0x0809 + + + /IGNORE:4089 /filealign:512 %(AdditionalOptions) + comctl32.lib;msimg32.lib;%(AdditionalDependencies) + true + $(IntDir)$(TargetName).pdb + true + true + UseLinkTimeCodeGeneration + 0x5130000 + true + + + $(IntDir)$(TargetName).lib + false + false + + + $(IntDir)$(TargetName).xml + + @@ -270,12 +495,12 @@ OnlyExplicitInline Size true - ../../include;%(AdditionalIncludeDirectories) + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;LOADAVATARS_EXPORTS;%(PreprocessorDefinitions) true - MultiThreadedDLL + MultiThreaded false true Fast @@ -299,7 +524,6 @@ /IGNORE:4089 /filealign:512 %(AdditionalOptions) comctl32.lib;msimg32.lib;%(AdditionalDependencies) - $(OutDir)zeronotify.dll true true false @@ -316,6 +540,64 @@ MachineX86 + + + NDEBUG;%(PreprocessorDefinitions) + true + true + .\Release/avatars.tlb + + + + + Full + OnlyExplicitInline + Size + true + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;LOADAVATARS_EXPORTS;%(PreprocessorDefinitions) + true + + + MultiThreaded + false + true + Fast + false + + + commonheaders.h + + + + + Level3 + true + ProgramDatabase + 4996;%(DisableSpecificWarnings) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0809 + + + /IGNORE:4089 /filealign:512 %(AdditionalOptions) + comctl32.lib;msimg32.lib;%(AdditionalDependencies) + true + true + false + + + true + true + UseLinkTimeCodeGeneration + 0x5130000 + false + + + $(IntDir)$(TargetName).lib + + diff --git a/ZeroNotification/Zero Notification_9.vcproj b/ZeroNotification/Zero Notification_9.vcproj index 526ce6b..e8e461a 100644 --- a/ZeroNotification/Zero Notification_9.vcproj +++ b/ZeroNotification/Zero Notification_9.vcproj @@ -48,7 +48,7 @@