small cleanup

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

1 files changed, 43 insertions, 35 deletions

diff --git a/plugins/Spamotron/Spamotron_10.vcxproj b/plugins/Spamotron/Spamotron_10.vcxproj
index 25e8e3707d..61287b0b3b 100644
--- a/plugins/Spamotron/Spamotron_10.vcxproj
+++ b/plugins/Spamotron/Spamotron_10.vcxproj
@@ -20,8 +20,6 @@
   </ItemGroup>

   <PropertyGroup Label="Globals">

     <ProjectGuid>{DBB261B4-E433-4DFF-8A5D-6C3B5B5F4FF4}</ProjectGuid>

-    <RootNamespace>

-    </RootNamespace>

     <ProjectName>Spamotron</ProjectName>

   </PropertyGroup>

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

@@ -63,22 +61,16 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

   </ImportGroup>

   <PropertyGroup Label="UserMacros" />

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

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

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

-  </PropertyGroup>

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

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

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

-  </PropertyGroup>

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

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

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

-    <IgnoreImportLibrary>true</IgnoreImportLibrary>

-  </PropertyGroup>

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

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

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

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

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

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Plugins\</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)\Plugins\</OutDir>

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

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

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

     <IgnoreImportLibrary>true</IgnoreImportLibrary>

   </PropertyGroup>

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

@@ -87,13 +79,18 @@
       <Optimization>Disabled</Optimization>

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

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

+      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>

     </ClCompile>

     <Link>

       <GenerateDebugInformation>true</GenerateDebugInformation>

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

-      <AdditionalDependencies>pcre\pcre.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>src\pcre\pcre.lib;%(AdditionalDependencies)</AdditionalDependencies>

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

       <AdditionalOptions>/NODEFAULTLIB:LIBCMT %(AdditionalOptions)</AdditionalOptions>

+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>

+      <SubSystem>Windows</SubSystem>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

     </Link>

     <ResourceCompile>

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

@@ -106,13 +103,17 @@
       <Optimization>Disabled</Optimization>

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

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

+      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>

     </ClCompile>

     <Link>

       <GenerateDebugInformation>true</GenerateDebugInformation>

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

-      <AdditionalDependencies>pcre\pcre64.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>src\pcre\pcre64.lib;%(AdditionalDependencies)</AdditionalDependencies>

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

       <AdditionalOptions>/NODEFAULTLIB:LIBCMT %(AdditionalOptions)</AdditionalOptions>

+      <SubSystem>Windows</SubSystem>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

     </Link>

     <ResourceCompile>

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

@@ -124,24 +125,24 @@
       <WarningLevel>Level3</WarningLevel>

       <Optimization>Full</Optimization>

       <FunctionLevelLinking>true</FunctionLevelLinking>

-      <IntrinsicFunctions>false</IntrinsicFunctions>

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

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

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

       <StringPooling>true</StringPooling>

-      <PrecompiledHeader>NotUsing</PrecompiledHeader>

-      <PrecompiledHeaderFile>

-      </PrecompiledHeaderFile>

+      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>

     </ClCompile>

     <Link>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <OptimizeReferences>true</OptimizeReferences>

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

-      <AdditionalDependencies>pcre\pcre.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>src\pcre\pcre.lib;%(AdditionalDependencies)</AdditionalDependencies>

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

-      <AdditionalOptions>/PDBALTPATH:%_PDB% /NODEFAULTLIB:LIBCMT %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalOptions>/NODEFAULTLIB:LIBCMT %(AdditionalOptions)</AdditionalOptions>

+      <SubSystem>Windows</SubSystem>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

     </Link>

     <ResourceCompile>

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

@@ -153,24 +154,24 @@
       <WarningLevel>Level3</WarningLevel>

       <Optimization>Full</Optimization>

       <FunctionLevelLinking>true</FunctionLevelLinking>

-      <IntrinsicFunctions>false</IntrinsicFunctions>

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

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

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

       <StringPooling>true</StringPooling>

-      <PrecompiledHeader>NotUsing</PrecompiledHeader>

-      <PrecompiledHeaderFile>

-      </PrecompiledHeaderFile>

+      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>

     </ClCompile>

     <Link>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <OptimizeReferences>true</OptimizeReferences>

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

-      <AdditionalDependencies>pcre\pcre64.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>src\pcre\pcre64.lib;%(AdditionalDependencies)</AdditionalDependencies>

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

-      <AdditionalOptions>/PDBALTPATH:%_PDB% /NODEFAULTLIB:LIBCMT %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalOptions>/NODEFAULTLIB:LIBCMT %(AdditionalOptions)</AdditionalOptions>

+      <SubSystem>Windows</SubSystem>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

     </Link>

     <ResourceCompile>

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

@@ -178,21 +179,28 @@
     </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClCompile Include="sqlite3\sqlite3.c" />

+    <ClCompile Include="src\sqlite3\sqlite3.c">

+      <PrecompiledHeader>NotUsing</PrecompiledHeader>

+    </ClCompile>

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

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

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

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

+    <ClCompile Include="src\stdafx.cpp">

+      <PrecompiledHeader>Create</PrecompiledHeader>

+    </ClCompile>

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

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="pcre\pcre.h" />

-    <ClInclude Include="sqlite3\sqlite3.h" />

+    <ClInclude Include="src\pcre\pcre.h" />

+    <ClInclude Include="src\sqlite3\sqlite3.h" />

     <ClInclude Include="src\common.h" />

     <ClInclude Include="src\resource.h" />

+    <ClInclude Include="src\Version.h" />

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="res\spamotron.rc" />

+    <ResourceCompile Include="res\Version.rc" />

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">