modernopt: common project

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

25 files changed, 48 insertions, 834 deletions

diff --git a/bin10/mir_dev.sln b/bin10/mir_dev.sln
index 0a506e9f6a..4143f51ae6 100644
--- a/bin10/mir_dev.sln
+++ b/bin10/mir_dev.sln
@@ -24,7 +24,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AdvaImg", "..\plugins\AdvaI
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Scriver", "..\plugins\Scriver\scriver_10.vcxproj", "{B8928210-546C-4AE3-956B-E2B724E6B8E5}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ModernOpt", "..\plugins\ModernOpt\modernopt_10.vcxproj", "{153DD132-084C-4DE4-8F40-A088BCB22723}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ModernOpt", "..\plugins\ModernOpt\modernopt.vcxproj", "{153DD132-084C-4DE4-8F40-A088BCB22723}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TabSRMM", "..\plugins\TabSRMM\tabsrmm_10.vcxproj", "{99D26CA1-BFD4-4E77-9A1E-919E54CF33F7}"

 EndProject

diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln
index b6b641a9f6..3dd26009e6 100644
--- a/bin10/mir_full.sln
+++ b/bin10/mir_full.sln
@@ -24,7 +24,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AdvaImg", "..\plugins\AdvaI
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Scriver", "..\plugins\Scriver\scriver_10.vcxproj", "{B8928210-546C-4AE3-956B-E2B724E6B8E5}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ModernOpt", "..\plugins\ModernOpt\modernopt_10.vcxproj", "{153DD132-084C-4DE4-8F40-A088BCB22723}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ModernOpt", "..\plugins\ModernOpt\modernopt.vcxproj", "{153DD132-084C-4DE4-8F40-A088BCB22723}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TabSRMM", "..\plugins\TabSRMM\tabsrmm_10.vcxproj", "{99D26CA1-BFD4-4E77-9A1E-919E54CF33F7}"

 EndProject

diff --git a/bin10/mir_full_pro.sln b/bin10/mir_full_pro.sln
index 317b59b989..a807f813fc 100644
--- a/bin10/mir_full_pro.sln
+++ b/bin10/mir_full_pro.sln
@@ -24,7 +24,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AdvaImg", "..\plugins\AdvaI
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Scriver", "..\plugins\Scriver\scriver_10.vcxproj", "{B8928210-546C-4AE3-956B-E2B724E6B8E5}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ModernOpt", "..\plugins\ModernOpt\modernopt_10.vcxproj", "{153DD132-084C-4DE4-8F40-A088BCB22723}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ModernOpt", "..\plugins\ModernOpt\modernopt.vcxproj", "{153DD132-084C-4DE4-8F40-A088BCB22723}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TabSRMM", "..\plugins\TabSRMM\tabsrmm_10.vcxproj", "{99D26CA1-BFD4-4E77-9A1E-919E54CF33F7}"

 EndProject

diff --git a/bin10/miranda32.sln b/bin10/miranda32.sln
index f3cd959cc4..b12b2afdf6 100644
--- a/bin10/miranda32.sln
+++ b/bin10/miranda32.sln
@@ -22,7 +22,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbx_mmap", "..\plugins\db3x
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AdvaImg", "..\plugins\AdvaImg\AdvaImg_10.vcxproj", "{D0C4EACD-F264-4CFA-9AFC-3918FEC31A9A}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ModernOpt", "..\plugins\modernopt\modernopt_10.vcxproj", "{153DD132-084C-4DE4-8F40-A088BCB22723}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ModernOpt", "..\plugins\modernopt\modernopt.vcxproj", "{153DD132-084C-4DE4-8F40-A088BCB22723}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TabSRMM", "..\plugins\TabSRMM\tabsrmm_10.vcxproj", "{99D26CA1-BFD4-4E77-9A1E-919E54CF33F7}"

 EndProject

diff --git a/bin12/mir_dev.sln b/bin12/mir_dev.sln
index 812d7d6670..5efae7d9b3 100644
--- a/bin12/mir_dev.sln
+++ b/bin12/mir_dev.sln
@@ -26,7 +26,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AdvaImg", "..\plugins\AdvaI
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Scriver", "..\plugins\Scriver\scriver_12.vcxproj", "{B8928210-546C-4AE3-956B-E2B724E6B8E5}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ModernOpt", "..\plugins\ModernOpt\modernopt_12.vcxproj", "{153DD132-084C-4DE4-8F40-A088BCB22723}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ModernOpt", "..\plugins\ModernOpt\modernopt.vcxproj", "{153DD132-084C-4DE4-8F40-A088BCB22723}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TabSRMM", "..\plugins\TabSRMM\tabsrmm_12.vcxproj", "{99D26CA1-BFD4-4E77-9A1E-919E54CF33F7}"

 EndProject

diff --git a/bin12/mir_full.sln b/bin12/mir_full.sln
index 49056994b2..ae8e1caddf 100644
--- a/bin12/mir_full.sln
+++ b/bin12/mir_full.sln
@@ -26,7 +26,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AdvaImg", "..\plugins\AdvaI
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Scriver", "..\plugins\Scriver\scriver_12.vcxproj", "{B8928210-546C-4AE3-956B-E2B724E6B8E5}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ModernOpt", "..\plugins\ModernOpt\modernopt_12.vcxproj", "{153DD132-084C-4DE4-8F40-A088BCB22723}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ModernOpt", "..\plugins\ModernOpt\modernopt.vcxproj", "{153DD132-084C-4DE4-8F40-A088BCB22723}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TabSRMM", "..\plugins\TabSRMM\tabsrmm_12.vcxproj", "{99D26CA1-BFD4-4E77-9A1E-919E54CF33F7}"

 EndProject

diff --git a/bin12/miranda32.sln b/bin12/miranda32.sln
index 36bb6111f9..8182c62148 100644
--- a/bin12/miranda32.sln
+++ b/bin12/miranda32.sln
@@ -24,7 +24,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbx_mmap", "..\plugins\db3x
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AdvaImg", "..\plugins\AdvaImg\AdvaImg_12.vcxproj", "{D0C4EACD-F264-4CFA-9AFC-3918FEC31A9A}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ModernOpt", "..\plugins\modernopt\modernopt_12.vcxproj", "{153DD132-084C-4DE4-8F40-A088BCB22723}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ModernOpt", "..\plugins\modernopt\modernopt.vcxproj", "{153DD132-084C-4DE4-8F40-A088BCB22723}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TabSRMM", "..\plugins\TabSRMM\tabsrmm_12.vcxproj", "{99D26CA1-BFD4-4E77-9A1E-919E54CF33F7}"

 EndProject

diff --git a/bin14/mir_dev.sln b/bin14/mir_dev.sln
index 406bedba35..79135ab77e 100644
--- a/bin14/mir_dev.sln
+++ b/bin14/mir_dev.sln
@@ -26,7 +26,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AdvaImg", "..\plugins\AdvaI
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Scriver", "..\plugins\Scriver\scriver_14.vcxproj", "{B8928210-546C-4AE3-956B-E2B724E6B8E5}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ModernOpt", "..\plugins\ModernOpt\modernopt_14.vcxproj", "{153DD132-084C-4DE4-8F40-A088BCB22723}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ModernOpt", "..\plugins\ModernOpt\modernopt.vcxproj", "{153DD132-084C-4DE4-8F40-A088BCB22723}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TabSRMM", "..\plugins\TabSRMM\tabsrmm_14.vcxproj", "{99D26CA1-BFD4-4E77-9A1E-919E54CF33F7}"

 EndProject

diff --git a/bin14/mir_full.sln b/bin14/mir_full.sln
index 8346d0b181..07c3f2b19f 100644
--- a/bin14/mir_full.sln
+++ b/bin14/mir_full.sln
@@ -26,7 +26,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AdvaImg", "..\plugins\AdvaI
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Scriver", "..\plugins\Scriver\scriver_14.vcxproj", "{B8928210-546C-4AE3-956B-E2B724E6B8E5}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ModernOpt", "..\plugins\ModernOpt\modernopt_14.vcxproj", "{153DD132-084C-4DE4-8F40-A088BCB22723}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ModernOpt", "..\plugins\ModernOpt\modernopt.vcxproj", "{153DD132-084C-4DE4-8F40-A088BCB22723}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TabSRMM", "..\plugins\TabSRMM\tabsrmm_14.vcxproj", "{99D26CA1-BFD4-4E77-9A1E-919E54CF33F7}"

 EndProject

diff --git a/bin14/miranda32.sln b/bin14/miranda32.sln
index ef1dee3402..ae669c5a88 100644
--- a/bin14/miranda32.sln
+++ b/bin14/miranda32.sln
@@ -24,7 +24,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbx_mmap", "..\plugins\db3x
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AdvaImg", "..\plugins\AdvaImg\AdvaImg_14.vcxproj", "{D0C4EACD-F264-4CFA-9AFC-3918FEC31A9A}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ModernOpt", "..\plugins\modernopt\modernopt_14.vcxproj", "{153DD132-084C-4DE4-8F40-A088BCB22723}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ModernOpt", "..\plugins\modernopt\modernopt.vcxproj", "{153DD132-084C-4DE4-8F40-A088BCB22723}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TabSRMM", "..\plugins\TabSRMM\tabsrmm_14.vcxproj", "{99D26CA1-BFD4-4E77-9A1E-919E54CF33F7}"

 EndProject

diff --git a/plugins/ModernOpt/modernopt.vcxproj b/plugins/ModernOpt/modernopt.vcxproj
new file mode 100644
index 0000000000..4c1caf1fe2
--- /dev/null
+++ b/plugins/ModernOpt/modernopt.vcxproj
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <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>ModernOpt</ProjectName>

+    <ProjectGuid>{153DD132-084C-4DE4-8F40-A088BCB22723}</ProjectGuid>

+  </PropertyGroup>

+  <ImportGroup Label="PropertySheets">

+    <Import Project="$(ProjectDir)..\..\build\vc.common\plugin.props" />

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/plugins/ModernOpt/modernopt.vcxproj.filters b/plugins/ModernOpt/modernopt.vcxproj.filters
new file mode 100644
index 0000000000..de5ad9f66c
--- /dev/null
+++ b/plugins/ModernOpt/modernopt.vcxproj.filters
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />

+</Project>
\ No newline at end of file
diff --git a/plugins/ModernOpt/modernopt_10.vcxproj b/plugins/ModernOpt/modernopt_10.vcxproj
deleted file mode 100644
index 85fb748d67..0000000000
--- a/plugins/ModernOpt/modernopt_10.vcxproj
+++ /dev/null
@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup Label="ProjectConfigurations">

-    <ProjectConfiguration Include="Debug|Win32">

-      <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>ModernOpt</ProjectName>

-    <ProjectGuid>{153DD132-084C-4DE4-8F40-A088BCB22723}</ProjectGuid>

-  </PropertyGroup>

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

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

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <CharacterSet>Unicode</CharacterSet>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-  </PropertyGroup>

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

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <CharacterSet>Unicode</CharacterSet>

-  </PropertyGroup>

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

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <CharacterSet>Unicode</CharacterSet>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-  </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">

-  </ImportGroup>

-  <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)'=='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)'=='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|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.30128.1</_ProjectFileVersion>

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

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

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

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

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

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

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

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

-    <IgnoreImportLibrary>true</IgnoreImportLibrary>

-  </PropertyGroup>

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

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

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

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

-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <PrecompiledHeader>Use</PrecompiledHeader>

-      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

-      <ExceptionHandling>false</ExceptionHandling>

-    </ClCompile>

-    <ResourceCompile>

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

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

-    </ResourceCompile>

-    <Link>

-      <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

-      <SubSystem>Windows</SubSystem>

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

-    </Link>

-  </ItemDefinitionGroup>

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

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

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

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

-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <PrecompiledHeader>Use</PrecompiledHeader>

-      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>

-      <WarningLevel>Level3</WarningLevel>

-      <ExceptionHandling>false</ExceptionHandling>

-    </ClCompile>

-    <ResourceCompile>

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

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

-    </ResourceCompile>

-    <Link>

-      <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

-      <SubSystem>Windows</SubSystem>

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

-    </Link>

-  </ItemDefinitionGroup>

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

-    <ClCompile>

-      <Optimization>Full</Optimization>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

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

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

-      <StringPooling>true</StringPooling>

-      <ExceptionHandling>false</ExceptionHandling>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FloatingPointModel>Fast</FloatingPointModel>

-      <PrecompiledHeader>Use</PrecompiledHeader>

-      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>

-      <WarningLevel>Level3</WarningLevel>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-    </ClCompile>

-    <ResourceCompile>

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

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

-    </ResourceCompile>

-    <Link>

-      <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

-      <SubSystem>Windows</SubSystem>

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

-      <AdditionalOptions>/PDBALTPATH:%_PDB%</AdditionalOptions>

-    </Link>

-  </ItemDefinitionGroup>

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

-    <ClCompile>

-      <Optimization>Full</Optimization>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

-      <OmitFramePointers>false</OmitFramePointers>

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

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

-      <StringPooling>true</StringPooling>

-      <ExceptionHandling>false</ExceptionHandling>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FloatingPointModel>Fast</FloatingPointModel>

-      <PrecompiledHeader>Use</PrecompiledHeader>

-      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>

-      <WarningLevel>Level3</WarningLevel>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-    </ClCompile>

-    <ResourceCompile>

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

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

-    </ResourceCompile>

-    <Link>

-      <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

-      <SubSystem>Windows</SubSystem>

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

-      <AdditionalOptions>/PDBALTPATH:%_PDB%</AdditionalOptions>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemGroup>

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

-      <PrecompiledHeader>Create</PrecompiledHeader>

-    </ClCompile>

-    <ClCompile Include="src\modernopt.cpp" />

-    <ClCompile Include="src\mopt_home.cpp" />

-    <ClCompile Include="src\mopt_ignore.cpp" />

-    <ClCompile Include="src\mopt_selector.cpp" />

-    <ClCompile Include="src\main.cpp" />

-  </ItemGroup>

-  <ItemGroup>

-    <ClInclude Include="src\commonheaders.h" />

-    <ClInclude Include="src\modernopt.h" />

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

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

-  </ItemGroup>

-  <ItemGroup>

-    <ResourceCompile Include="res\resource.rc" />

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

-  </ItemGroup>

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

-  <ImportGroup Label="ExtensionTargets">

-  </ImportGroup>

-</Project>
\ No newline at end of file
diff --git a/plugins/ModernOpt/modernopt_10.vcxproj.filters b/plugins/ModernOpt/modernopt_10.vcxproj.filters
deleted file mode 100644
index c29d81ea1f..0000000000
--- a/plugins/ModernOpt/modernopt_10.vcxproj.filters
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup>

-    <Filter Include="Source Files">

-      <UniqueIdentifier>{71014e62-0e8c-4230-ae7f-44b8be91f5ab}</UniqueIdentifier>

-      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>

-    </Filter>

-    <Filter Include="Header Files">

-      <UniqueIdentifier>{bcb87915-818c-4466-98c7-109ed4d2f974}</UniqueIdentifier>

-      <Extensions>h;hpp;hxx;hm;inl</Extensions>

-    </Filter>

-    <Filter Include="Resource Files">

-      <UniqueIdentifier>{3047613f-a83d-4d2b-87af-14844ab89a24}</UniqueIdentifier>

-      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>

-    </Filter>

-  </ItemGroup>

-  <ItemGroup>

-    <ClCompile Include="src\main.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="src\modernopt.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="src\mopt_home.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="src\mopt_ignore.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="src\mopt_selector.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

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

-      <Filter>Source Files</Filter>

-    </ClCompile>

-  </ItemGroup>

-  <ItemGroup>

-    <ClInclude Include="src\commonheaders.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="src\modernopt.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

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

-      <Filter>Header Files</Filter>

-    </ClInclude>

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

-      <Filter>Header Files</Filter>

-    </ClInclude>

-  </ItemGroup>

-  <ItemGroup>

-    <ResourceCompile Include="res\resource.rc">

-      <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/ModernOpt/modernopt_12.vcxproj b/plugins/ModernOpt/modernopt_12.vcxproj
deleted file mode 100644
index ac1ca545b1..0000000000
--- a/plugins/ModernOpt/modernopt_12.vcxproj
+++ /dev/null
@@ -1,214 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup Label="ProjectConfigurations">

-    <ProjectConfiguration Include="Debug|Win32">

-      <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>ModernOpt</ProjectName>

-    <ProjectGuid>{153DD132-084C-4DE4-8F40-A088BCB22723}</ProjectGuid>

-  </PropertyGroup>

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

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

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <CharacterSet>Unicode</CharacterSet>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-    <PlatformToolset>v120_xp</PlatformToolset>

-  </PropertyGroup>

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

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <CharacterSet>Unicode</CharacterSet>

-    <PlatformToolset>v120_xp</PlatformToolset>

-  </PropertyGroup>

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

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <CharacterSet>Unicode</CharacterSet>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-    <PlatformToolset>v120_xp</PlatformToolset>

-  </PropertyGroup>

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

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <CharacterSet>Unicode</CharacterSet>

-    <PlatformToolset>v120_xp</PlatformToolset>

-  </PropertyGroup>

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

-  <ImportGroup Label="ExtensionSettings">

-  </ImportGroup>

-  <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)'=='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)'=='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|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.30128.1</_ProjectFileVersion>

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

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

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

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

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

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

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

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

-    <IgnoreImportLibrary>true</IgnoreImportLibrary>

-  </PropertyGroup>

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

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

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

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

-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <PrecompiledHeader>Use</PrecompiledHeader>

-      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

-      <ExceptionHandling>false</ExceptionHandling>

-    </ClCompile>

-    <ResourceCompile>

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

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

-    </ResourceCompile>

-    <Link>

-      <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

-      <SubSystem>Windows</SubSystem>

-      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>

-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>

-    </Link>

-  </ItemDefinitionGroup>

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

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

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

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

-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <PrecompiledHeader>Use</PrecompiledHeader>

-      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>

-      <WarningLevel>Level3</WarningLevel>

-      <ExceptionHandling>false</ExceptionHandling>

-    </ClCompile>

-    <ResourceCompile>

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

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

-    </ResourceCompile>

-    <Link>

-      <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

-      <SubSystem>Windows</SubSystem>

-      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>

-    </Link>

-  </ItemDefinitionGroup>

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

-    <ClCompile>

-      <Optimization>Full</Optimization>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

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

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

-      <StringPooling>true</StringPooling>

-      <ExceptionHandling>false</ExceptionHandling>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FloatingPointModel>Fast</FloatingPointModel>

-      <PrecompiledHeader>Use</PrecompiledHeader>

-      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>

-      <WarningLevel>Level3</WarningLevel>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-    </ClCompile>

-    <ResourceCompile>

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

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

-    </ResourceCompile>

-    <Link>

-      <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

-      <SubSystem>Windows</SubSystem>

-      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>

-    </Link>

-  </ItemDefinitionGroup>

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

-    <ClCompile>

-      <Optimization>Full</Optimization>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

-      <OmitFramePointers>false</OmitFramePointers>

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

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

-      <StringPooling>true</StringPooling>

-      <ExceptionHandling>false</ExceptionHandling>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FloatingPointModel>Fast</FloatingPointModel>

-      <PrecompiledHeader>Use</PrecompiledHeader>

-      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>

-      <WarningLevel>Level3</WarningLevel>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-    </ClCompile>

-    <ResourceCompile>

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

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

-    </ResourceCompile>

-    <Link>

-      <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

-      <SubSystem>Windows</SubSystem>

-      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemGroup>

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

-      <PrecompiledHeader>Create</PrecompiledHeader>

-    </ClCompile>

-    <ClCompile Include="src\modernopt.cpp" />

-    <ClCompile Include="src\mopt_home.cpp" />

-    <ClCompile Include="src\mopt_ignore.cpp" />

-    <ClCompile Include="src\mopt_selector.cpp" />

-    <ClCompile Include="src\main.cpp" />

-  </ItemGroup>

-  <ItemGroup>

-    <ClInclude Include="src\commonheaders.h" />

-    <ClInclude Include="src\modernopt.h" />

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

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

-  </ItemGroup>

-  <ItemGroup>

-    <ResourceCompile Include="res\resource.rc" />

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

-  </ItemGroup>

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

-  <ImportGroup Label="ExtensionTargets">

-  </ImportGroup>

-</Project>
\ No newline at end of file
diff --git a/plugins/ModernOpt/modernopt_12.vcxproj.filters b/plugins/ModernOpt/modernopt_12.vcxproj.filters
deleted file mode 100644
index c29d81ea1f..0000000000
--- a/plugins/ModernOpt/modernopt_12.vcxproj.filters
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup>

-    <Filter Include="Source Files">

-      <UniqueIdentifier>{71014e62-0e8c-4230-ae7f-44b8be91f5ab}</UniqueIdentifier>

-      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>

-    </Filter>

-    <Filter Include="Header Files">

-      <UniqueIdentifier>{bcb87915-818c-4466-98c7-109ed4d2f974}</UniqueIdentifier>

-      <Extensions>h;hpp;hxx;hm;inl</Extensions>

-    </Filter>

-    <Filter Include="Resource Files">

-      <UniqueIdentifier>{3047613f-a83d-4d2b-87af-14844ab89a24}</UniqueIdentifier>

-      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>

-    </Filter>

-  </ItemGroup>

-  <ItemGroup>

-    <ClCompile Include="src\main.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="src\modernopt.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="src\mopt_home.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="src\mopt_ignore.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="src\mopt_selector.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

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

-      <Filter>Source Files</Filter>

-    </ClCompile>

-  </ItemGroup>

-  <ItemGroup>

-    <ClInclude Include="src\commonheaders.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="src\modernopt.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

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

-      <Filter>Header Files</Filter>

-    </ClInclude>

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

-      <Filter>Header Files</Filter>

-    </ClInclude>

-  </ItemGroup>

-  <ItemGroup>

-    <ResourceCompile Include="res\resource.rc">

-      <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/ModernOpt/modernopt_14.vcxproj b/plugins/ModernOpt/modernopt_14.vcxproj
deleted file mode 100644
index 22d4d35f24..0000000000
--- a/plugins/ModernOpt/modernopt_14.vcxproj
+++ /dev/null
@@ -1,214 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup Label="ProjectConfigurations">

-    <ProjectConfiguration Include="Debug|Win32">

-      <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>ModernOpt</ProjectName>

-    <ProjectGuid>{153DD132-084C-4DE4-8F40-A088BCB22723}</ProjectGuid>

-  </PropertyGroup>

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

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

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <CharacterSet>Unicode</CharacterSet>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-    <PlatformToolset>v140_xp</PlatformToolset>

-  </PropertyGroup>

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

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <CharacterSet>Unicode</CharacterSet>

-    <PlatformToolset>v140_xp</PlatformToolset>

-  </PropertyGroup>

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

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <CharacterSet>Unicode</CharacterSet>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-    <PlatformToolset>v140_xp</PlatformToolset>

-  </PropertyGroup>

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

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <CharacterSet>Unicode</CharacterSet>

-    <PlatformToolset>v140_xp</PlatformToolset>

-  </PropertyGroup>

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

-  <ImportGroup Label="ExtensionSettings">

-  </ImportGroup>

-  <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)'=='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)'=='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|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.30128.1</_ProjectFileVersion>

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

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

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

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

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

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

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

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

-    <IgnoreImportLibrary>true</IgnoreImportLibrary>

-  </PropertyGroup>

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

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

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

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

-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <PrecompiledHeader>Use</PrecompiledHeader>

-      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>

-      <WarningLevel>Level3</WarningLevel>

-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

-      <ExceptionHandling>false</ExceptionHandling>

-    </ClCompile>

-    <ResourceCompile>

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

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

-    </ResourceCompile>

-    <Link>

-      <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

-      <SubSystem>Windows</SubSystem>

-      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin14\lib</AdditionalLibraryDirectories>

-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>

-    </Link>

-  </ItemDefinitionGroup>

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

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

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

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

-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <PrecompiledHeader>Use</PrecompiledHeader>

-      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>

-      <WarningLevel>Level3</WarningLevel>

-      <ExceptionHandling>false</ExceptionHandling>

-    </ClCompile>

-    <ResourceCompile>

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

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

-    </ResourceCompile>

-    <Link>

-      <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

-      <SubSystem>Windows</SubSystem>

-      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin14\lib</AdditionalLibraryDirectories>

-    </Link>

-  </ItemDefinitionGroup>

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

-    <ClCompile>

-      <Optimization>Full</Optimization>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

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

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

-      <StringPooling>true</StringPooling>

-      <ExceptionHandling>false</ExceptionHandling>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FloatingPointModel>Fast</FloatingPointModel>

-      <PrecompiledHeader>Use</PrecompiledHeader>

-      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>

-      <WarningLevel>Level3</WarningLevel>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-    </ClCompile>

-    <ResourceCompile>

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

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

-    </ResourceCompile>

-    <Link>

-      <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

-      <SubSystem>Windows</SubSystem>

-      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin14\lib</AdditionalLibraryDirectories>

-    </Link>

-  </ItemDefinitionGroup>

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

-    <ClCompile>

-      <Optimization>Full</Optimization>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

-      <OmitFramePointers>false</OmitFramePointers>

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

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

-      <StringPooling>true</StringPooling>

-      <ExceptionHandling>false</ExceptionHandling>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FloatingPointModel>Fast</FloatingPointModel>

-      <PrecompiledHeader>Use</PrecompiledHeader>

-      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>

-      <WarningLevel>Level3</WarningLevel>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-    </ClCompile>

-    <ResourceCompile>

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

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

-    </ResourceCompile>

-    <Link>

-      <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

-      <SubSystem>Windows</SubSystem>

-      <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin14\lib</AdditionalLibraryDirectories>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemGroup>

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

-      <PrecompiledHeader>Create</PrecompiledHeader>

-    </ClCompile>

-    <ClCompile Include="src\modernopt.cpp" />

-    <ClCompile Include="src\mopt_home.cpp" />

-    <ClCompile Include="src\mopt_ignore.cpp" />

-    <ClCompile Include="src\mopt_selector.cpp" />

-    <ClCompile Include="src\main.cpp" />

-  </ItemGroup>

-  <ItemGroup>

-    <ClInclude Include="src\commonheaders.h" />

-    <ClInclude Include="src\modernopt.h" />

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

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

-  </ItemGroup>

-  <ItemGroup>

-    <ResourceCompile Include="res\resource.rc" />

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

-  </ItemGroup>

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

-  <ImportGroup Label="ExtensionTargets">

-  </ImportGroup>

-</Project>
\ No newline at end of file
diff --git a/plugins/ModernOpt/modernopt_14.vcxproj.filters b/plugins/ModernOpt/modernopt_14.vcxproj.filters
deleted file mode 100644
index c29d81ea1f..0000000000
--- a/plugins/ModernOpt/modernopt_14.vcxproj.filters
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup>

-    <Filter Include="Source Files">

-      <UniqueIdentifier>{71014e62-0e8c-4230-ae7f-44b8be91f5ab}</UniqueIdentifier>

-      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>

-    </Filter>

-    <Filter Include="Header Files">

-      <UniqueIdentifier>{bcb87915-818c-4466-98c7-109ed4d2f974}</UniqueIdentifier>

-      <Extensions>h;hpp;hxx;hm;inl</Extensions>

-    </Filter>

-    <Filter Include="Resource Files">

-      <UniqueIdentifier>{3047613f-a83d-4d2b-87af-14844ab89a24}</UniqueIdentifier>

-      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>

-    </Filter>

-  </ItemGroup>

-  <ItemGroup>

-    <ClCompile Include="src\main.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="src\modernopt.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="src\mopt_home.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="src\mopt_ignore.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="src\mopt_selector.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

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

-      <Filter>Source Files</Filter>

-    </ClCompile>

-  </ItemGroup>

-  <ItemGroup>

-    <ClInclude Include="src\commonheaders.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClInclude Include="src\modernopt.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

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

-      <Filter>Header Files</Filter>

-    </ClInclude>

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

-      <Filter>Header Files</Filter>

-    </ClInclude>

-  </ItemGroup>

-  <ItemGroup>

-    <ResourceCompile Include="res\resource.rc">

-      <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/ModernOpt/src/main.cpp b/plugins/ModernOpt/src/main.cpp
index 52f71b7709..c482834ada 100644
--- a/plugins/ModernOpt/src/main.cpp
+++ b/plugins/ModernOpt/src/main.cpp
@@ -1,4 +1,4 @@
-#include "commonheaders.h"

+#include "stdafx.h"

 

 

 HINSTANCE hInst;

diff --git a/plugins/ModernOpt/src/modernopt.cpp b/plugins/ModernOpt/src/modernopt.cpp
index 186670df28..c4ff2702f4 100644
--- a/plugins/ModernOpt/src/modernopt.cpp
+++ b/plugins/ModernOpt/src/modernopt.cpp
@@ -24,7 +24,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include "commonheaders.h"

+#include "stdafx.h"

 

 //#define MOPT_SAMPLE_PAGES

 

diff --git a/plugins/ModernOpt/src/mopt_home.cpp b/plugins/ModernOpt/src/mopt_home.cpp
index e89026193f..da340420b5 100644
--- a/plugins/ModernOpt/src/mopt_home.cpp
+++ b/plugins/ModernOpt/src/mopt_home.cpp
@@ -24,7 +24,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include "commonheaders.h"

+#include "stdafx.h"

 

 extern HMODULE hInst;

 

diff --git a/plugins/ModernOpt/src/mopt_ignore.cpp b/plugins/ModernOpt/src/mopt_ignore.cpp
index 9f9e53efa4..0135165ebc 100644
--- a/plugins/ModernOpt/src/mopt_ignore.cpp
+++ b/plugins/ModernOpt/src/mopt_ignore.cpp
@@ -24,7 +24,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include "commonheaders.h"

+#include "stdafx.h"

 

 static HWND g_hwndModernOptIgnore = NULL;

 

diff --git a/plugins/ModernOpt/src/mopt_selector.cpp b/plugins/ModernOpt/src/mopt_selector.cpp
index 70d47e9239..4b4ebfbfdc 100644
--- a/plugins/ModernOpt/src/mopt_selector.cpp
+++ b/plugins/ModernOpt/src/mopt_selector.cpp
@@ -24,7 +24,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include "commonheaders.h"

+#include "stdafx.h"

 

 static void sttApplySkin(MODERNOPTOBJECT *obj, TCHAR *fn)

 {

diff --git a/plugins/ModernOpt/src/stdafx.cpp b/plugins/ModernOpt/src/stdafx.cxx
index 048b14e9d2..6fb37564b7 100644
--- a/plugins/ModernOpt/src/stdafx.cpp
+++ b/plugins/ModernOpt/src/stdafx.cxx
@@ -15,4 +15,4 @@ 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 "commonheaders.h"
\ No newline at end of file
+#include "stdafx.h"
\ No newline at end of file
diff --git a/plugins/ModernOpt/src/commonheaders.h b/plugins/ModernOpt/src/stdafx.h
index 35464a469c..6c9881a342 100644
--- a/plugins/ModernOpt/src/commonheaders.h
+++ b/plugins/ModernOpt/src/stdafx.h
@@ -22,8 +22,6 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#define _CRT_SECURE_NO_WARNINGS

-

 #include <windows.h>

 #include <windowsx.h>

 #include <time.h>