projects cleanup

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

3 files changed, 77 insertions, 78 deletions

diff --git a/plugins/TabSRMM/icons/ICONSXP/ICONSXP.rc b/plugins/TabSRMM/icons/ICONSXP/ICONSXP.rc
index 1cce21c489..eae155d26d 100644
--- a/plugins/TabSRMM/icons/ICONSXP/ICONSXP.rc
+++ b/plugins/TabSRMM/icons/ICONSXP/ICONSXP.rc
@@ -56,7 +56,7 @@ IDI_STRIKEOUT           ICON                    "../../res/proxal/strikethrough.
 IDI_FONTFACE            ICON                    "../../res/proxal/font.ico"

 IDI_FONTCOLOR           ICON                    "../../res/proxal/font2.ico"

 IDI_SOUNDSON            ICON                    "../../res/proxal/sounds_on.ico"

-IDI_SOUNDSOFF           ICON                    "../../res/proxal/overlay_disabled.ico"

+IDI_SOUNDSOFF           ICON                    "../../res/proxal/sounds_off.ico"

 IDI_EMPTY               ICON                    "../../res/empty.ico"

 IDI_RESERVED10          ICON                    "../../res/empty.ico"

 IDI_SESSIONLIST         ICON                    "../../res/proxal/slist.ico"

diff --git a/plugins/TabSRMM/icons/ICONSXP/iconsxp_10.vcxproj b/plugins/TabSRMM/icons/ICONSXP/iconsxp_10.vcxproj
index eb3fce85af..8a69917ce3 100644
--- a/plugins/TabSRMM/icons/ICONSXP/iconsxp_10.vcxproj
+++ b/plugins/TabSRMM/icons/ICONSXP/iconsxp_10.vcxproj
@@ -5,27 +5,39 @@
       <Configuration>Debug</Configuration>

       <Platform>Win32</Platform>

     </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|x64">

+      <Configuration>Debug</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

     <ProjectConfiguration Include="Release|Win32">

       <Configuration>Release</Configuration>

       <Platform>Win32</Platform>

     </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|x64">

+      <Configuration>Release</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

   </ItemGroup>

   <PropertyGroup Label="Globals">

     <ProjectName>TabSRMM_icons_XP</ProjectName>

     <ProjectGuid>{987C5A57-A46B-4779-BB85-077E21F7BF7F}</ProjectGuid>

-    <RootNamespace>ICONSXP</RootNamespace>

-    <Keyword>Win32Proj</Keyword>

-    <SccProjectName />

-    <SccLocalPath />

   </PropertyGroup>

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

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

     <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

+    <CharacterSet>Unicode</CharacterSet>

+  </PropertyGroup>

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

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <CharacterSet>Unicode</CharacterSet>

   </PropertyGroup>

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

     <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

+    <CharacterSet>Unicode</CharacterSet>

+  </PropertyGroup>

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

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <CharacterSet>Unicode</CharacterSet>

   </PropertyGroup>

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

   <ImportGroup Label="ExtensionSettings">

@@ -33,100 +45,83 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

   </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

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

     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

   </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

   <PropertyGroup Label="UserMacros" />

   <PropertyGroup>

     <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>

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

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</OutDir>

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>

-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

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

-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />

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

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Icons\TabSRMM_icons_XP\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Icons\TabSRMM_icons_XP\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Icons\TabSRMM_icons_XP\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Icons\TabSRMM_icons_XP\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>

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

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

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

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

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

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

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

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

   </PropertyGroup>

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

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;ICONSXP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <MinimalRebuild>true</MinimalRebuild>

-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

-      <PrecompiledHeader>Use</PrecompiledHeader>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

-    </ClCompile>

     <Link>

-      <OutputFile>$(OutDir)ICONSXP.dll</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>$(OutDir)ICONSXP.pdb</ProgramDatabaseFile>

       <SubSystem>Windows</SubSystem>

       <NoEntryPoint>true</NoEntryPoint>

-      <ImportLibrary>$(OutDir)ICONSXP.lib</ImportLibrary>

-      <TargetMachine>MachineX86</TargetMachine>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

     </Link>

+    <ResourceCompile>

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

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

+    </ResourceCompile>

+  </ItemDefinitionGroup>

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

+    <Link>

+      <SubSystem>Windows</SubSystem>

+      <NoEntryPoint>true</NoEntryPoint>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+    </Link>

+    <ResourceCompile>

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

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

+    </ResourceCompile>

   </ItemDefinitionGroup>

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

-    <ClCompile>

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

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

-      <PrecompiledHeader>Use</PrecompiledHeader>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-    </ClCompile>

     <Link>

-      <OutputFile>$(OutDir)tabsrmm_icons.dll</OutputFile>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Windows</SubSystem>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <NoEntryPoint>true</NoEntryPoint>

-      <ImportLibrary>$(OutDir)ICONSXP.lib</ImportLibrary>

-      <TargetMachine>MachineX86</TargetMachine>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+    </Link>

+    <ResourceCompile>

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

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

+    </ResourceCompile>

+  </ItemDefinitionGroup>

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

+    <Link>

+      <SubSystem>Windows</SubSystem>

+      <NoEntryPoint>true</NoEntryPoint>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

     </Link>

+    <ResourceCompile>

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

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

+    </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

     <ClInclude Include="resource.h" />

   </ItemGroup>

   <ItemGroup>

-    <None Include="..\..\res\angeli-icons\AddXP.ico" />

-    <None Include="..\..\res\button.bold.ico" />

-    <None Include="..\..\res\button.fontface.ico" />

-    <None Include="..\..\res\button.italic.ico" />

-    <None Include="..\..\res\button.textcolor.ico" />

-    <None Include="..\..\res\button.underline.ico" />

-    <None Include="..\..\res\angeli-icons\CloseXP.ico" />

-    <None Include="..\..\res\delete.ico" />

-    <None Include="..\..\res\empty.ico" />

-    <None Include="..\..\res\error.ico" />

-    <None Include="..\..\res\angeli-icons\HistoryXP.ico" />

-    <None Include="..\..\res\angeli-icons\Incom.ico" />

-    <None Include="..\..\res\angeli-icons\InfoXP.ico" />

-    <None Include="..\..\res\Logo.ico" />

-    <None Include="..\..\res\angeli-icons\MultiXP.ico" />

-    <None Include="..\..\res\angeli-icons\OptXP.ico" />

-    <None Include="..\..\res\angeli-icons\Outg.ico" />

-    <None Include="..\..\res\angeli-icons\Pencil.ico" />

-    <None Include="..\..\res\angeli-icons\PicXP.ico" />

-    <None Include="..\..\res\angeli-icons\Quote02.ico" />

-    <None Include="..\..\res\angeli-icons\SaveXP.ico" />

-    <None Include="..\..\res\secureim_off.ico" />

-    <None Include="..\..\res\secureim_on.ico" />

-    <None Include="..\..\res\angeli-icons\Send.ico" />

-    <None Include="..\..\res\smbutton.ico" />

-    <None Include="..\..\res\statuschange.ico" />

-    <None Include="..\..\res\Typing32.ico" />

-    <None Include="..\..\res\unknown.bmp" />

-    <None Include="ReadMe.txt" />

-  </ItemGroup>

-  <ItemGroup>

     <ResourceCompile Include="ICONSXP.rc" />

   </ItemGroup>

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

diff --git a/plugins/TabSRMM/icons/ICONS_NOVA/ICONS_NOVA_10.vcxproj b/plugins/TabSRMM/icons/ICONS_NOVA/ICONS_NOVA_10.vcxproj
index b950afda67..3e01ecadb9 100644
--- a/plugins/TabSRMM/icons/ICONS_NOVA/ICONS_NOVA_10.vcxproj
+++ b/plugins/TabSRMM/icons/ICONS_NOVA/ICONS_NOVA_10.vcxproj
@@ -78,6 +78,7 @@
     </Link>

     <ResourceCompile>

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

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

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -88,6 +89,7 @@
     </Link>

     <ResourceCompile>

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

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

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -98,6 +100,7 @@
     </Link>

     <ResourceCompile>

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

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

     </ResourceCompile>

   </ItemDefinitionGroup>

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

@@ -108,6 +111,7 @@
     </Link>

     <ResourceCompile>

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

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

     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>