project fix

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

3 files changed, 51 insertions, 60 deletions

diff --git a/plugins/!NotAdopted/RemovePersonalSettings/RemovePersonalSettings.ini b/plugins/!NotAdopted/RemovePersonalSettings/docs/RemovePersonalSettings.ini
index 789803de56..789803de56 100644
--- a/plugins/!NotAdopted/RemovePersonalSettings/RemovePersonalSettings.ini
+++ b/plugins/!NotAdopted/RemovePersonalSettings/docs/RemovePersonalSettings.ini
diff --git a/plugins/!NotAdopted/RemovePersonalSettings/rps.vcxproj b/plugins/!NotAdopted/RemovePersonalSettings/rps.vcxproj
index 864f8d3d9a..7cd920220c 100644
--- a/plugins/!NotAdopted/RemovePersonalSettings/rps.vcxproj
+++ b/plugins/!NotAdopted/RemovePersonalSettings/rps.vcxproj
@@ -23,17 +23,20 @@
     </SccProjectName>

     <SccLocalPath>

     </SccLocalPath>

+    <ProjectName>RemovePersonalSettings</ProjectName>

   </PropertyGroup>

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

   <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)'=='Release|x64'" Label="Configuration">

     <ConfigurationType>DynamicLibrary</ConfigurationType>

     <UseOfMfc>false</UseOfMfc>

     <CharacterSet>MultiByte</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

   </PropertyGroup>

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

     <ConfigurationType>DynamicLibrary</ConfigurationType>

@@ -66,28 +69,28 @@
   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

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

-    <OutDir>.\Debug\</OutDir>

-    <IntDir>.\Debug\</IntDir>

+    <OutDir>$(SolutionDir)$(Configuration)\Plugins\</OutDir>

+    <IntDir>$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>

     <LinkIncremental>true</LinkIncremental>

   </PropertyGroup>

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

-    <OutDir>.\Debug\</OutDir>

-    <IntDir>.\Debug\</IntDir>

+    <OutDir>$(SolutionDir)$(Configuration)64\Plugins\</OutDir>

+    <IntDir>$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>

     <LinkIncremental>true</LinkIncremental>

   </PropertyGroup>

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

-    <OutDir>.\Release\</OutDir>

-    <IntDir>.\Release\</IntDir>

+    <OutDir>$(SolutionDir)$(Configuration)\Plugins\</OutDir>

+    <IntDir>$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>

     <LinkIncremental>false</LinkIncremental>

   </PropertyGroup>

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

-    <OutDir>.\Release\</OutDir>

-    <IntDir>.\Release\</IntDir>

+    <OutDir>$(SolutionDir)$(Configuration)64\Plugins\</OutDir>

+    <IntDir>$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>

     <LinkIncremental>false</LinkIncremental>

   </PropertyGroup>

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

     <ClCompile>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <InlineFunctionExpansion>Default</InlineFunctionExpansion>

       <FunctionLevelLinking>false</FunctionLevelLinking>

       <Optimization>Disabled</Optimization>

@@ -96,12 +99,8 @@
       <MinimalRebuild>true</MinimalRebuild>

       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

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

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

-      <AssemblerListingLocation>.\Debug\</AssemblerListingLocation>

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

       <BrowseInformation>true</BrowseInformation>

-      <PrecompiledHeaderOutputFile>.\Debug\rps.pch</PrecompiledHeaderOutputFile>

-      <ObjectFileName>.\Debug\</ObjectFileName>

-      <ProgramDataBaseFileName>.\Debug\</ProgramDataBaseFileName>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

     </ClCompile>

     <Midl>

@@ -117,22 +116,21 @@
     </ResourceCompile>

     <Bscmake>

       <SuppressStartupBanner>true</SuppressStartupBanner>

-      <OutputFile>.\Debug\rps.bsc</OutputFile>

     </Bscmake>

     <Link>

       <SuppressStartupBanner>true</SuppressStartupBanner>

       <LinkDLL>true</LinkDLL>

       <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Console</SubSystem>

-      <OutputFile>../../bin/debug/plugins/RemovePersonalSettings.dll</OutputFile>

-      <ImportLibrary>.\Debug\RemovePersonalSettings.lib</ImportLibrary>

+      <SubSystem>Windows</SubSystem>

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

       <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <AdditionalLibraryDirectories>../../bin10/lib</AdditionalLibraryDirectories>

+      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

     </Link>

   </ItemDefinitionGroup>

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

     <ClCompile>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <InlineFunctionExpansion>Default</InlineFunctionExpansion>

       <FunctionLevelLinking>false</FunctionLevelLinking>

       <Optimization>Disabled</Optimization>

@@ -140,12 +138,8 @@
       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

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

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

-      <AssemblerListingLocation>.\Debug\</AssemblerListingLocation>

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

       <BrowseInformation>true</BrowseInformation>

-      <PrecompiledHeaderOutputFile>.\Debug\rps.pch</PrecompiledHeaderOutputFile>

-      <ObjectFileName>.\Debug\</ObjectFileName>

-      <ProgramDataBaseFileName>.\Debug\</ProgramDataBaseFileName>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

     </ClCompile>

     <Midl>

@@ -160,34 +154,29 @@
     </ResourceCompile>

     <Bscmake>

       <SuppressStartupBanner>true</SuppressStartupBanner>

-      <OutputFile>.\Debug\rps.bsc</OutputFile>

     </Bscmake>

     <Link>

       <SuppressStartupBanner>true</SuppressStartupBanner>

       <LinkDLL>true</LinkDLL>

       <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Console</SubSystem>

-      <OutputFile>../../bin/debug/plugins/RemovePersonalSettings.dll</OutputFile>

-      <ImportLibrary>.\Debug\RemovePersonalSettings.lib</ImportLibrary>

+      <SubSystem>Windows</SubSystem>

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

       <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <AdditionalLibraryDirectories>../../bin10/lib</AdditionalLibraryDirectories>

+      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

     </Link>

   </ItemDefinitionGroup>

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

     <ClCompile>

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <StringPooling>true</StringPooling>

       <FunctionLevelLinking>true</FunctionLevelLinking>

-      <Optimization>MaxSpeed</Optimization>

+      <Optimization>Full</Optimization>

       <SuppressStartupBanner>true</SuppressStartupBanner>

       <WarningLevel>Level3</WarningLevel>

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

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

-      <AssemblerListingLocation>.\Release\</AssemblerListingLocation>

-      <PrecompiledHeaderOutputFile>.\Release\rps.pch</PrecompiledHeaderOutputFile>

-      <ObjectFileName>.\Release\</ObjectFileName>

-      <ProgramDataBaseFileName>.\Release\</ProgramDataBaseFileName>

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

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

     </ClCompile>

     <Midl>

       <SuppressStartupBanner>true</SuppressStartupBanner>

@@ -202,33 +191,31 @@
     </ResourceCompile>

     <Bscmake>

       <SuppressStartupBanner>true</SuppressStartupBanner>

-      <OutputFile>.\Release\rps.bsc</OutputFile>

     </Bscmake>

     <Link>

       <SuppressStartupBanner>true</SuppressStartupBanner>

       <LinkDLL>true</LinkDLL>

-      <SubSystem>Console</SubSystem>

-      <OutputFile>../../bin/release/plugins/RemovePersonalSettings.dll</OutputFile>

-      <ImportLibrary>.\Release\RemovePersonalSettings.lib</ImportLibrary>

+      <SubSystem>Windows</SubSystem>

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

       <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <AdditionalLibraryDirectories>../../bin10/lib</AdditionalLibraryDirectories>

+      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

     </Link>

   </ItemDefinitionGroup>

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

     <ClCompile>

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <StringPooling>true</StringPooling>

       <FunctionLevelLinking>true</FunctionLevelLinking>

-      <Optimization>MaxSpeed</Optimization>

+      <Optimization>Full</Optimization>

       <SuppressStartupBanner>true</SuppressStartupBanner>

       <WarningLevel>Level3</WarningLevel>

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

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

-      <AssemblerListingLocation>.\Release\</AssemblerListingLocation>

-      <PrecompiledHeaderOutputFile>.\Release\rps.pch</PrecompiledHeaderOutputFile>

-      <ObjectFileName>.\Release\</ObjectFileName>

-      <ProgramDataBaseFileName>.\Release\</ProgramDataBaseFileName>

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

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

     </ClCompile>

     <Midl>

       <SuppressStartupBanner>true</SuppressStartupBanner>

@@ -242,29 +229,31 @@
     </ResourceCompile>

     <Bscmake>

       <SuppressStartupBanner>true</SuppressStartupBanner>

-      <OutputFile>.\Release\rps.bsc</OutputFile>

     </Bscmake>

     <Link>

       <SuppressStartupBanner>true</SuppressStartupBanner>

       <LinkDLL>true</LinkDLL>

-      <SubSystem>Console</SubSystem>

-      <OutputFile>../../bin/release/plugins/RemovePersonalSettings.dll</OutputFile>

-      <ImportLibrary>.\Release\RemovePersonalSettings.lib</ImportLibrary>

+      <SubSystem>Windows</SubSystem>

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

       <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <AdditionalLibraryDirectories>../../bin10/lib</AdditionalLibraryDirectories>

+      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

     <ClCompile Include="src\rps.cpp" />

   </ItemGroup>

   <ItemGroup>

-    <CustomBuild Include="RemovePersonalSettings.ini">

-      <FileType>Document</FileType>

-    </CustomBuild>

     <CustomBuild Include="docs\rps_changelog.txt" />

     <CustomBuild Include="docs\rps_readme.txt" />

     <CustomBuild Include="docs\rps_version.txt" />

   </ItemGroup>

+  <ItemGroup>

+    <None Include="docs\RemovePersonalSettings.ini" />

+  </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

   </ImportGroup>

diff --git a/plugins/!NotAdopted/RemovePersonalSettings/rps.vcxproj.filters b/plugins/!NotAdopted/RemovePersonalSettings/rps.vcxproj.filters
index 13c73e43c8..5e7d5fa6dc 100644
--- a/plugins/!NotAdopted/RemovePersonalSettings/rps.vcxproj.filters
+++ b/plugins/!NotAdopted/RemovePersonalSettings/rps.vcxproj.filters
@@ -18,9 +18,6 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <CustomBuild Include="RemovePersonalSettings.ini">

-      <Filter>Docs</Filter>

-    </CustomBuild>

     <CustomBuild Include="docs\rps_changelog.txt">

       <Filter>Docs</Filter>

     </CustomBuild>

@@ -36,4 +33,9 @@
       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

+  <ItemGroup>

+    <None Include="docs\RemovePersonalSettings.ini">

+      <Filter>Docs</Filter>

+    </None>

+  </ItemGroup>

 </Project>
\ No newline at end of file