small cleanup

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

15 files changed, 203 insertions, 154 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">

diff --git a/plugins/Spamotron/Spamotron_10.vcxproj.filters b/plugins/Spamotron/Spamotron_10.vcxproj.filters
index d92ea8f2d8..0758212e31 100644
--- a/plugins/Spamotron/Spamotron_10.vcxproj.filters
+++ b/plugins/Spamotron/Spamotron_10.vcxproj.filters
@@ -9,10 +9,6 @@
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>

       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>

     </Filter>

-    <Filter Include="Header Files\Resource Files">

-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>

-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>

-    </Filter>

     <Filter Include="Source Files\sqlite3">

       <UniqueIdentifier>{219d5f59-e7c3-415c-a3af-539b7222082f}</UniqueIdentifier>

     </Filter>

@@ -22,9 +18,13 @@
     <Filter Include="Header Files\pcre">

       <UniqueIdentifier>{5c4a0315-c2e2-4685-97e1-4131819b7dbc}</UniqueIdentifier>

     </Filter>

+    <Filter Include="Resource Files">

+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>

+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>

+    </Filter>

   </ItemGroup>

   <ItemGroup>

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

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

       <Filter>Source Files\sqlite3</Filter>

     </ClCompile>

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

@@ -42,6 +42,9 @@
     <ClCompile Include="src\bayes.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

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

@@ -50,16 +53,22 @@
     <ClInclude Include="src\resource.h">

       <Filter>Header Files</Filter>

     </ClInclude>

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

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

       <Filter>Header Files\sqlite3</Filter>

     </ClInclude>

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

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

       <Filter>Header Files\pcre</Filter>

     </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

   </ItemGroup>

   <ItemGroup>

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

-      <Filter>Header Files\Resource Files</Filter>

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

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

+      <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/plugins/Spamotron/Spamotron_11.vcxproj b/plugins/Spamotron/Spamotron_11.vcxproj
index 0199cdc71f..cb7012c7d4 100644
--- a/plugins/Spamotron/Spamotron_11.vcxproj
+++ b/plugins/Spamotron/Spamotron_11.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" />

@@ -67,22 +65,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'">

@@ -91,14 +83,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)..\..\bin11\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>

@@ -111,13 +107,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)..\..\bin11\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>

@@ -129,24 +129,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)..\..\bin11\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>

+      <SubSystem>Windows</SubSystem>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

     </Link>

     <ResourceCompile>

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

@@ -158,24 +158,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)..\..\bin11\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>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

@@ -183,21 +183,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">

diff --git a/plugins/Spamotron/Spamotron_11.vcxproj.filters b/plugins/Spamotron/Spamotron_11.vcxproj.filters
index d92ea8f2d8..0758212e31 100644
--- a/plugins/Spamotron/Spamotron_11.vcxproj.filters
+++ b/plugins/Spamotron/Spamotron_11.vcxproj.filters
@@ -9,10 +9,6 @@
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>

       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>

     </Filter>

-    <Filter Include="Header Files\Resource Files">

-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>

-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>

-    </Filter>

     <Filter Include="Source Files\sqlite3">

       <UniqueIdentifier>{219d5f59-e7c3-415c-a3af-539b7222082f}</UniqueIdentifier>

     </Filter>

@@ -22,9 +18,13 @@
     <Filter Include="Header Files\pcre">

       <UniqueIdentifier>{5c4a0315-c2e2-4685-97e1-4131819b7dbc}</UniqueIdentifier>

     </Filter>

+    <Filter Include="Resource Files">

+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>

+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>

+    </Filter>

   </ItemGroup>

   <ItemGroup>

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

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

       <Filter>Source Files\sqlite3</Filter>

     </ClCompile>

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

@@ -42,6 +42,9 @@
     <ClCompile Include="src\bayes.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

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

@@ -50,16 +53,22 @@
     <ClInclude Include="src\resource.h">

       <Filter>Header Files</Filter>

     </ClInclude>

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

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

       <Filter>Header Files\sqlite3</Filter>

     </ClInclude>

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

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

       <Filter>Header Files\pcre</Filter>

     </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

   </ItemGroup>

   <ItemGroup>

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

-      <Filter>Header Files\Resource Files</Filter>

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

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

+      <Filter>Resource Files</Filter>

     </ResourceCompile>

   </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/plugins/Spamotron/res/Version.rc b/plugins/Spamotron/res/Version.rc
new file mode 100644
index 0000000000..5bfbab4754
--- /dev/null
+++ b/plugins/Spamotron/res/Version.rc
@@ -0,0 +1,38 @@
+// Microsoft Visual C++ generated resource script.

+//

+#ifdef APSTUDIO_INVOKED

+#error this file is not editable by Microsoft Visual C++

+#endif //APSTUDIO_INVOKED

+

+#include "afxres.h"

+#include "..\src\version.h"

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION __FILEVERSION_STRING

+ PRODUCTVERSION __FILEVERSION_STRING

+ FILEFLAGSMASK 0x17L

+#ifdef _DEBUG

+ FILEFLAGS 0x1L

+#else

+ FILEFLAGS 0x0L

+#endif

+ FILEOS 0x4L

+ FILETYPE 0x0L

+ FILESUBTYPE 0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "000004b0"

+        BEGIN

+            VALUE "FileDescription", __DESCRIPTION

+            VALUE "InternalName", __PLUGIN_NAME

+            VALUE "LegalCopyright", __COPYRIGHT

+            VALUE "OriginalFilename", __FILENAME

+            VALUE "ProductName", __PLUGIN_NAME

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x0, 1200

+    END

+END

diff --git a/plugins/Spamotron/res/spamotron.rc b/plugins/Spamotron/res/spamotron.rc
index ae2b3bb252..beef978d7f 100644
--- a/plugins/Spamotron/res/spamotron.rc
+++ b/plugins/Spamotron/res/spamotron.rc
@@ -13,55 +13,6 @@
 #undef APSTUDIO_READONLY_SYMBOLS

 

 /////////////////////////////////////////////////////////////////////////////

-// Neutral resources

-

-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)

-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

-#pragma code_page(1251)

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Version

-//

-

-VS_VERSION_INFO VERSIONINFO

- FILEVERSION 0,0,4,6

- PRODUCTVERSION 0,0,4,6

- FILEFLAGSMASK 0x17L

-#ifdef _DEBUG

- FILEFLAGS 0x1L

-#else

- FILEFLAGS 0x0L

-#endif

- FILEOS 0x40004L

- FILETYPE 0x2L

- FILESUBTYPE 0x0L

-BEGIN

-    BLOCK "StringFileInfo"

-    BEGIN

-        BLOCK "000004b0"

-        BEGIN

-            VALUE "CompanyName", "vu1tur.eu.org"

-            VALUE "FileDescription", "Spam-o-tron anti-spam plugin for Miranda"

-            VALUE "FileVersion", "0.0.4.6"

-            VALUE "InternalName", "spamotron"

-            VALUE "LegalCopyright", "Copyright (c) 2010 vu1tur"

-            VALUE "OriginalFilename", "spamotron.dll"

-            VALUE "ProductName", "Spam-o-tron"

-            VALUE "ProductVersion", "0.0.4.6"

-        END

-    END

-    BLOCK "VarFileInfo"

-    BEGIN

-        VALUE "Translation", 0x0, 1200

-    END

-END

-

-#endif    // Neutral resources

-/////////////////////////////////////////////////////////////////////////////

-

-

-/////////////////////////////////////////////////////////////////////////////

 // Russian (Russia) resources

 

 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)

@@ -76,7 +27,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 

 1 TEXTINCLUDE 

 BEGIN

-    "resource.h\0"

+    "..\\src\\resource.h\0"

 END

 

 2 TEXTINCLUDE 

diff --git a/plugins/Spamotron/src/Version.h b/plugins/Spamotron/src/Version.h
new file mode 100644
index 0000000000..1675d96051
--- /dev/null
+++ b/plugins/Spamotron/src/Version.h
@@ -0,0 +1,14 @@
+#define __MAJOR_VERSION				0

+#define __MINOR_VERSION				0

+#define __RELEASE_NUM				4

+#define __BUILD_NUM					6

+

+#define __FILEVERSION_STRING		__MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM

+

+#define __PLUGIN_NAME				"Spam-o-tron"

+#define __FILENAME					"Spamotron.dll"

+#define __DESCRIPTION 				"Anti-spam plugin with captcha and Bayes filtering."

+#define __AUTHOR					"vu1tur"

+#define __AUTHOREMAIL				"to@vu1tur.eu.org"

+#define __AUTHORWEB					"http://miranda-ng.org/"

+#define __COPYRIGHT					"© 2010-2013 vu1tur"

diff --git a/plugins/Spamotron/src/common.h b/plugins/Spamotron/src/common.h
index ac36f729b1..e8d0903b13 100644
--- a/plugins/Spamotron/src/common.h
+++ b/plugins/Spamotron/src/common.h
@@ -4,7 +4,6 @@
 #include <commctrl.h>

 #include <stdlib.h>

 #include <time.h>

-#define MIRANDA_VER 0x0A00

 

 #include <newpluginapi.h>

 #include <m_database.h>

@@ -18,11 +17,12 @@
 #include <m_langpack.h>

 #include <m_protosvc.h>

 

-//#include "m_updater.h"

 #include "m_folders.h"

-#include "../pcre/pcre.h"

+

+#include "pcre/pcre.h"

 

 #include "resource.h"

+#include "version.h"

 

 #define PLUGIN_NAME "Spam-o-tron"

 

@@ -125,7 +125,7 @@ int LogToSystemHistory(char *message, char *origmessage);
 

 /* bayes.c */

 

-#include "../sqlite3/sqlite3.h"

+#include "sqlite3\sqlite3.h"

 extern sqlite3 *bayesdb;

 #define BAYESDB_PATH "spamotron"

 #define BAYESDB_FILENAME "bayes.db"

diff --git a/plugins/Spamotron/pcre/pcre.h b/plugins/Spamotron/src/pcre/pcre.h
index 5aed08e722..5aed08e722 100644
--- a/plugins/Spamotron/pcre/pcre.h
+++ b/plugins/Spamotron/src/pcre/pcre.h
diff --git a/plugins/Spamotron/pcre/pcre.lib b/plugins/Spamotron/src/pcre/pcre.lib
index 8320452ab9..8320452ab9 100644
--- a/plugins/Spamotron/pcre/pcre.lib
+++ b/plugins/Spamotron/src/pcre/pcre.lib
diff --git a/plugins/Spamotron/pcre/pcre64.lib b/plugins/Spamotron/src/pcre/pcre64.lib
index a2432056ed..a2432056ed 100644
--- a/plugins/Spamotron/pcre/pcre64.lib
+++ b/plugins/Spamotron/src/pcre/pcre64.lib
diff --git a/plugins/Spamotron/src/spamotron.cpp b/plugins/Spamotron/src/spamotron.cpp
index 82c0a2aa46..78b95f6e8e 100644
--- a/plugins/Spamotron/src/spamotron.cpp
+++ b/plugins/Spamotron/src/spamotron.cpp
@@ -5,19 +5,18 @@ HANDLE hOptInitialize, hModulesLoaded, hDBContactAdded, hDBEventAdded, hDBEventF
 time_t last_queue_check = 0;

 int hLangpack;

 

-#define MIID_SPAMOTRON {0x14331048,0x5a73,0x4fdb,{0xb9,0x09,0x2d,0x7e,0x18,0x25,0xa0,0x12}} /* 14331048-5a73-4fdb-b909-2d7e1825a012 */

-

 PLUGININFOEX pluginInfo = {

 	sizeof(PLUGININFOEX),

-	PLUGIN_NAME,

-	PLUGIN_MAKE_VERSION(0,0,4,6),

-	"Anti-spam plugin with captcha and Bayes filtering.",

-	"vu1tur",

-	"to@vu1tur.eu.org",

-	"© 2010 vu1tur",

-	"http://vu1tur.eu.org/spamotron",

+	__PLUGIN_NAME,

+	PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),

+	__DESCRIPTION,

+	__AUTHOR,

+	__AUTHOREMAIL,

+	__COPYRIGHT,

+	__AUTHORWEB,

 	UNICODE_AWARE,

-	MIID_SPAMOTRON

+	// 14331048-5a73-4fdb-b909-2d7e1825a012

+	{0x14331048, 0x5a73, 0x4fdb, {0xb9, 0x09, 0x2d, 0x7e, 0x18, 0x25, 0xa0, 0x12}}

 };

 

 

@@ -547,12 +546,6 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda
 	return &pluginInfo;

 }

 

-static const MUUID interfaces[] = {MIID_SPAMOTRON, MIID_LAST};

-extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)

-{

-	return interfaces;

-}

-

 extern "C" __declspec(dllexport) int Load()

 {

 	mir_getLP(&pluginInfo);

diff --git a/plugins/Spamotron/sqlite3/sqlite3.c b/plugins/Spamotron/src/sqlite3/sqlite3.c
index 7bf4048eaa..9193fa37fd 100644
--- a/plugins/Spamotron/sqlite3/sqlite3.c
+++ b/plugins/Spamotron/src/sqlite3/sqlite3.c
@@ -19,6 +19,8 @@
 **
 ** This amalgamation was generated on 2009-04-15 12:44:27 UTC.
 */
+#define _CRT_SECURE_NO_WARNINGS

+
 #define SQLITE_CORE 1
 #define SQLITE_AMALGAMATION 1
 #ifndef SQLITE_PRIVATE
diff --git a/plugins/Spamotron/sqlite3/sqlite3.h b/plugins/Spamotron/src/sqlite3/sqlite3.h
index 7273475444..7273475444 100644
--- a/plugins/Spamotron/sqlite3/sqlite3.h
+++ b/plugins/Spamotron/src/sqlite3/sqlite3.h
diff --git a/plugins/Spamotron/src/stdafx.cpp b/plugins/Spamotron/src/stdafx.cpp
new file mode 100644
index 0000000000..1976d867da
--- /dev/null
+++ b/plugins/Spamotron/src/stdafx.cpp
@@ -0,0 +1,18 @@
+/*

+Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)

+

+This program is free software; you can redistribute it and/or

+modify it under the terms of the GNU General Public License

+as published by the Free Software Foundation version 2

+of the License.

+

+This program is distributed in the hope that it will be useful,

+but WITHOUT ANY WARRANTY; without even the implied warranty of

+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+GNU General Public License for more details.

+

+You should have received a copy of the GNU General Public License

+along with this program. If not, see <http://www.gnu.org/licenses/>.

+*/

+

+#include "common.h"
\ No newline at end of file