BuddyExpectator project fixes

git-svn-id: http://svn.miranda-ng.org/main/trunk@106 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 28 insertions, 53 deletions

diff --git a/plugins/BuddyExpectator/BuddyExpectator10.vcxproj b/plugins/BuddyExpectator/BuddyExpectator10.vcxproj
index 2c02531fc6..9e5020a571 100644
--- a/plugins/BuddyExpectator/BuddyExpectator10.vcxproj
+++ b/plugins/BuddyExpectator/BuddyExpectator10.vcxproj
@@ -26,23 +26,21 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

     <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <UseOfMfc>false</UseOfMfc>

     <CharacterSet>MultiByte</CharacterSet>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

     <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <UseOfMfc>false</UseOfMfc>

     <CharacterSet>MultiByte</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

     <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <UseOfMfc>false</UseOfMfc>

     <CharacterSet>MultiByte</CharacterSet>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

     <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <UseOfMfc>false</UseOfMfc>

     <CharacterSet>MultiByte</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

   <ImportGroup Label="ExtensionSettings">

@@ -86,6 +84,10 @@
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />

     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</IgnoreImportLibrary>

+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</IgnoreImportLibrary>

+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</IgnoreImportLibrary>

+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</IgnoreImportLibrary>

   </PropertyGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <Midl>

@@ -98,34 +100,26 @@
       </HeaderFileName>

     </Midl>

     <ClCompile>

-      <Optimization>Full</Optimization>

+      <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>../../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;BUDDYEXPECTATOR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;BUDDYEXPECTATOR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

-      <WholeProgramOptimization>true</WholeProgramOptimization>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

     </ClCompile>

     <ResourceCompile>

-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <Culture>0x0409</Culture>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <AdditionalIncludeDirectories>../../include/msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

       <GenerateDebugInformation>true</GenerateDebugInformation>

-      <TargetMachine>MachineX86</TargetMachine>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>

+      <SubSystem>Windows</SubSystem>

     </Link>

-    <Bscmake>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </Bscmake>

+    <Bscmake />

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <Midl>

@@ -145,27 +139,21 @@
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

-      <WholeProgramOptimization>true</WholeProgramOptimization>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <Culture>0x0409</Culture>

+      <AdditionalIncludeDirectories>../../include/msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

       <GenerateDebugInformation>true</GenerateDebugInformation>

-      <TargetMachine>MachineX86</TargetMachine>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>

+      <SubSystem>Windows</SubSystem>

     </Link>

-    <Bscmake>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </Bscmake>

+    <Bscmake />

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

     <Midl>

@@ -177,33 +165,25 @@
       </HeaderFileName>

     </Midl>

     <ClCompile>

-      <Optimization>Full</Optimization>

+      <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>../../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;BUDDYEXPECTATOR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;BUDDYEXPECTATOR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

-      <WholeProgramOptimization>true</WholeProgramOptimization>

     </ClCompile>

     <ResourceCompile>

-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <Culture>0x0409</Culture>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <AdditionalIncludeDirectories>../../include/msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

       <GenerateDebugInformation>true</GenerateDebugInformation>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>

+      <SubSystem>Windows</SubSystem>

     </Link>

-    <Bscmake>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </Bscmake>

+    <Bscmake />

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

     <Midl>

@@ -217,31 +197,26 @@
     <ClCompile>

       <Optimization>Full</Optimization>

       <AdditionalIncludeDirectories>../../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;BUDDYEXPECTATOR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;BUDDYEXPECTATOR_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <WarningLevel>Level3</WarningLevel>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

-      <WholeProgramOptimization>true</WholeProgramOptimization>

     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <Culture>0x0409</Culture>

+      <AdditionalIncludeDirectories>../../include/msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>

+      <SubSystem>Windows</SubSystem>

     </Link>

-    <Bscmake>

-      <SuppressStartupBanner>true</SuppressStartupBanner>

-    </Bscmake>

+    <Bscmake />

   </ItemDefinitionGroup>

   <ItemGroup>

     <ClCompile Include="BuddyExpectator.cpp">