another part of small project fixes

git-svn-id: http://miranda-plugins.googlecode.com/svn/trunk@223 e753b5eb-9565-29b2-b5c5-2cc6f99dfbcb

15 files changed, 207 insertions, 74 deletions

diff --git a/AuthState/authstate_10.vcxproj b/AuthState/authstate_10.vcxproj
index f54aef6..c9d4c44 100644
--- a/AuthState/authstate_10.vcxproj
+++ b/AuthState/authstate_10.vcxproj
@@ -123,14 +123,14 @@
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">$(SolutionDir)$(Configuration)/Obj/$(ProjectName)\</IntDir>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -175,6 +175,7 @@
       <DataExecutionPrevention>

       </DataExecutionPrevention>

       <TargetMachine>MachineX86</TargetMachine>

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

     </Link>

   </ItemDefinitionGroup>

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

@@ -201,6 +202,7 @@
       <DataExecutionPrevention>

       </DataExecutionPrevention>

       <TargetMachine>MachineX86</TargetMachine>

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

     </Link>

   </ItemDefinitionGroup>

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

@@ -223,6 +225,7 @@
       <DataExecutionPrevention>

       </DataExecutionPrevention>

       <TargetMachine>MachineX86</TargetMachine>

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

     </Link>

   </ItemDefinitionGroup>

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

@@ -249,6 +252,7 @@
       <DataExecutionPrevention>

       </DataExecutionPrevention>

       <TargetMachine>MachineX86</TargetMachine>

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

     </Link>

   </ItemDefinitionGroup>

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

diff --git a/Autorun/autorun.sln b/Autorun/autorun.sln
index a570d1b..35939fb 100644
--- a/Autorun/autorun.sln
+++ b/Autorun/autorun.sln
@@ -1,18 +1,24 @@
 

 Microsoft Visual Studio Solution File, Format Version 11.00

-# Visual C++ Express 2010

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "autorun", "autorun.vcxproj", "{F1959060-CB15-E24D-245B-F37D0D4FE717}"

+# Visual Studio 2010

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "autorun", "autorun.vcxproj", "{ED0C50B5-B9E0-8F7F-BB0C-FC8DC2967EE2}"

 EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Win32 = Debug|Win32

+		Debug|x64 = Debug|x64

 		Release|Win32 = Release|Win32

+		Release|x64 = Release|x64

 	EndGlobalSection

 	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{F1959060-CB15-E24D-245B-F37D0D4FE717}.Debug|Win32.ActiveCfg = Debug|Win32

-		{F1959060-CB15-E24D-245B-F37D0D4FE717}.Debug|Win32.Build.0 = Debug|Win32

-		{F1959060-CB15-E24D-245B-F37D0D4FE717}.Release|Win32.ActiveCfg = Release|Win32

-		{F1959060-CB15-E24D-245B-F37D0D4FE717}.Release|Win32.Build.0 = Release|Win32

+		{ED0C50B5-B9E0-8F7F-BB0C-FC8DC2967EE2}.Debug|Win32.ActiveCfg = Debug|Win32

+		{ED0C50B5-B9E0-8F7F-BB0C-FC8DC2967EE2}.Debug|Win32.Build.0 = Debug|Win32

+		{ED0C50B5-B9E0-8F7F-BB0C-FC8DC2967EE2}.Debug|x64.ActiveCfg = Debug|x64

+		{ED0C50B5-B9E0-8F7F-BB0C-FC8DC2967EE2}.Debug|x64.Build.0 = Debug|x64

+		{ED0C50B5-B9E0-8F7F-BB0C-FC8DC2967EE2}.Release|Win32.ActiveCfg = Release|Win32

+		{ED0C50B5-B9E0-8F7F-BB0C-FC8DC2967EE2}.Release|Win32.Build.0 = Release|Win32

+		{ED0C50B5-B9E0-8F7F-BB0C-FC8DC2967EE2}.Release|x64.ActiveCfg = Release|x64

+		{ED0C50B5-B9E0-8F7F-BB0C-FC8DC2967EE2}.Release|x64.Build.0 = Release|x64

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/Autorun/autorun.vcxproj b/Autorun/autorun.vcxproj
index f194b34..44f9e32 100644
--- a/Autorun/autorun.vcxproj
+++ b/Autorun/autorun.vcxproj
@@ -5,10 +5,18 @@
       <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">

     <SccProjectName />

@@ -20,11 +28,21 @@
     <UseOfMfc>false</UseOfMfc>

     <CharacterSet>MultiByte</CharacterSet>

   </PropertyGroup>

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

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

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

     <ConfigurationType>DynamicLibrary</ConfigurationType>

     <UseOfMfc>false</UseOfMfc>

     <CharacterSet>MultiByte</CharacterSet>

   </PropertyGroup>

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

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

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

   <ImportGroup Label="ExtensionSettings">

   </ImportGroup>

@@ -32,21 +50,39 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

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

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

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

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

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

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

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

+  </ImportGroup>

   <PropertyGroup Label="UserMacros" />

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

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

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

     <LinkIncremental>true</LinkIncremental>

   </PropertyGroup>

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

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

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

+    <LinkIncremental>true</LinkIncremental>

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

+    <IgnoreImportLibrary>true</IgnoreImportLibrary>

+  </PropertyGroup>

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

     <ClCompile>

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

@@ -82,6 +118,43 @@
       <SubSystem>Console</SubSystem>

       <BaseAddress>0x30040000</BaseAddress>

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

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

+    </Link>

+  </ItemDefinitionGroup>

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

+    <ClCompile>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>

+      <FunctionLevelLinking>false</FunctionLevelLinking>

+      <Optimization>Disabled</Optimization>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

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

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

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+    </ClCompile>

+    <Midl>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

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

+      <TypeLibraryName>.\Debug\autorun.tlb</TypeLibraryName>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+    </Midl>

+    <ResourceCompile>

+      <Culture>0x0809</Culture>

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

+    </ResourceCompile>

+    <Bscmake>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+    </Bscmake>

+    <Link>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <LinkDLL>true</LinkDLL>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Console</SubSystem>

+      <BaseAddress>0x30040000</BaseAddress>

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

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

     </Link>

   </ItemDefinitionGroup>

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

@@ -97,6 +170,7 @@
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;autorun_EXPORTS; _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BrowseInformation>true</BrowseInformation>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+      <WholeProgramOptimization>true</WholeProgramOptimization>

     </ClCompile>

     <Midl>

       <SuppressStartupBanner>true</SuppressStartupBanner>

@@ -122,6 +196,50 @@
       <AdditionalOptions> /FILEALIGN:512  /SECTION:.text,ER /IGNORE:4078   /IGNORE:4078 </AdditionalOptions>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

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

+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>

+    </Link>

+  </ItemDefinitionGroup>

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

+    <ClCompile>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <StringPooling>true</StringPooling>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <Optimization>MinSpace</Optimization>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <WarningLevel>Level3</WarningLevel>

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

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

+      <BrowseInformation>true</BrowseInformation>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+      <WholeProgramOptimization>true</WholeProgramOptimization>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+    </ClCompile>

+    <Midl>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

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

+      <TypeLibraryName>.\Release\autorun.tlb</TypeLibraryName>

+      <MkTypLibCompatible>false</MkTypLibCompatible>

+    </Midl>

+    <ResourceCompile>

+      <Culture>0x0409</Culture>

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

+    </ResourceCompile>

+    <Bscmake>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+    </Bscmake>

+    <Link>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <LinkDLL>true</LinkDLL>

+      <SubSystem>Console</SubSystem>

+      <MergeSections>.rdata=.text</MergeSections>

+      <BaseAddress>0x30040000</BaseAddress>

+      <AdditionalDependencies>kernel32.lib;user32.lib;advapi32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalOptions> /FILEALIGN:512  /SECTION:.text,ER /IGNORE:4078   /IGNORE:4078 </AdditionalOptions>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

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

+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>

     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/Autorun/main.c b/Autorun/main.c
index 34b0d0f..c5a498a 100644
--- a/Autorun/main.c
+++ b/Autorun/main.c
@@ -95,7 +95,7 @@ static BOOL CmpCurrentAndRegistry()
 		return FALSE;

 }

 

-static BOOL CALLBACK DlgProcAutorunOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

+static INT_PTR CALLBACK DlgProcAutorunOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	switch (msg)

 	{

diff --git a/Bass_interface/Bass_interface.vcxproj b/Bass_interface/Bass_interface.vcxproj
index 3498ccb..0100461 100644
--- a/Bass_interface/Bass_interface.vcxproj
+++ b/Bass_interface/Bass_interface.vcxproj
@@ -62,13 +62,13 @@
   <PropertyGroup>

     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/BossKeyPlus/BossKey_10.vcxproj b/BossKeyPlus/BossKey_10.vcxproj
index 121a1f2..777eddf 100644
--- a/BossKeyPlus/BossKey_10.vcxproj
+++ b/BossKeyPlus/BossKey_10.vcxproj
@@ -70,8 +70,8 @@
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">$(SolutionDir)$(Configuration)/Obj/$(ProjectName)\</IntDir>

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

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

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

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

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

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

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

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

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

@@ -198,6 +198,7 @@
       <ProgramDataBaseFileName>$(IntDir)vc70.pdb</ProgramDataBaseFileName>

       <WarningLevel>Level3</WarningLevel>

       <SuppressStartupBanner>true</SuppressStartupBanner>

+      <WholeProgramOptimization>true</WholeProgramOptimization>

     </ClCompile>

     <ResourceCompile>

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

@@ -220,6 +221,9 @@
       </DataExecutionPrevention>

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

       <TargetMachine>MachineX64</TargetMachine>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>

     </Link>

   </ItemDefinitionGroup>

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

diff --git a/BossKeyPlus/version.h b/BossKeyPlus/version.h
index ef4ae5d..f2391d8 100644
--- a/BossKeyPlus/version.h
+++ b/BossKeyPlus/version.h
@@ -6,6 +6,7 @@
 #define __MODULE_NAME "BossKey+ (x64)"

 #define __PLUGIN_ID 4305

 #define __PLUGIN_ID_STR "4305"

+#define __PLUGIN_NAME "BossKey+ (x64)"

 #elif defined ( _UNICODE )

 #define __MODULE_NAME "BossKey+ (Unicode)"

 #define __PLUGIN_ID 3694

diff --git a/BuddyExpectator/BuddyExpectator10.vcxproj b/BuddyExpectator/BuddyExpectator10.vcxproj
index 8bfceda..8389aa4 100644
--- a/BuddyExpectator/BuddyExpectator10.vcxproj
+++ b/BuddyExpectator/BuddyExpectator10.vcxproj
@@ -69,10 +69,6 @@
       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

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

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

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

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

       <WarningLevel>Level3</WarningLevel>

       <SuppressStartupBanner>true</SuppressStartupBanner>

       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

@@ -83,16 +79,13 @@
       <Culture>0x0409</Culture>

     </ResourceCompile>

     <Link>

-      <OutputFile>../../bin/$(Configuration)/plugins/BuddyExpectator.dll</OutputFile>

       <SuppressStartupBanner>true</SuppressStartupBanner>

       <GenerateDebugInformation>true</GenerateDebugInformation>

-      <ProgramDatabaseFile>.\Debug/BuddyExpectator.pdb</ProgramDatabaseFile>

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

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

       <TargetMachine>MachineX86</TargetMachine>

     </Link>

     <Bscmake>

       <SuppressStartupBanner>true</SuppressStartupBanner>

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

     </Bscmake>

   </ItemDefinitionGroup>

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

@@ -116,6 +109,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>

       <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+      <WholeProgramOptimization>true</WholeProgramOptimization>

     </ClCompile>

     <ResourceCompile>

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

@@ -127,6 +121,8 @@
       <TargetMachine>MachineX86</TargetMachine>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

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

+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>

     </Link>

     <Bscmake>

       <SuppressStartupBanner>true</SuppressStartupBanner>

diff --git a/BuddyPounce/buddypounce.sln b/BuddyPounce/buddypounce.sln
index 4bcf320..a9a6068 100644
--- a/BuddyPounce/buddypounce.sln
+++ b/BuddyPounce/buddypounce.sln
@@ -1,6 +1,6 @@
 

 Microsoft Visual Studio Solution File, Format Version 11.00

-# Visual C++ Express 2010

+# Visual Studio 2010

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "buddypounce", "buddypounce.vcxproj", "{6797F0C5-4885-4E0B-A34F-9805BBEB64E1}"

 EndProject

 Global

diff --git a/BuddyPounce/buddypounce.vcxproj b/BuddyPounce/buddypounce.vcxproj
index 05bd26a..fc8cd59 100644
--- a/BuddyPounce/buddypounce.vcxproj
+++ b/BuddyPounce/buddypounce.vcxproj
@@ -77,6 +77,7 @@
       <DataExecutionPrevention>

       </DataExecutionPrevention>

       <TargetMachine>MachineX86</TargetMachine>

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

     </Link>

     <Bscmake>

       <SuppressStartupBanner>true</SuppressStartupBanner>

@@ -103,6 +104,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>

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

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+      <WholeProgramOptimization>true</WholeProgramOptimization>

     </ClCompile>

     <ResourceCompile>

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

@@ -116,6 +118,8 @@
       <TargetMachine>MachineX86</TargetMachine>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>

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

     </Link>

     <Bscmake>

       <SuppressStartupBanner>true</SuppressStartupBanner>

diff --git a/MRA/Mra.vcxproj b/MRA/Mra.vcxproj
index cad7c76..62f5102 100644
--- a/MRA/Mra.vcxproj
+++ b/MRA/Mra.vcxproj
@@ -75,8 +75,8 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">$(SolutionDir)$(Configuration)/Plugins\</OutDir>

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

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

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

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

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

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

     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'" />

     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release Unicode|x64'">false</GenerateManifest>

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

@@ -209,7 +209,7 @@
       </PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

-      <AdditionalIncludeDirectories>./sdk;../../include;../ExternalAPI</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>./sdk;../include;../ExternalAPI</AdditionalIncludeDirectories>

     </ClCompile>

     <ProjectReference />

     <Link>

@@ -264,6 +264,7 @@
       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>

       </DebugInformationFormat>

+      <AdditionalIncludeDirectories>./sdk;../include;../ExternalAPI</AdditionalIncludeDirectories>

     </ClCompile>

     <ProjectReference>

       <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>

diff --git a/MenuItemEx/menuex.vcproj b/MenuItemEx/menuex.vcproj
index 1b3a248..84234fa 100644
--- a/MenuItemEx/menuex.vcproj
+++ b/MenuItemEx/menuex.vcproj
@@ -26,7 +26,7 @@
 				InlineFunctionExpansion="1"

 				FavorSizeOrSpeed="2"

 				OmitFramePointers="FALSE"

-				AdditionalIncludeDirectories="../../include;../ExternalAPI"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				StringPooling="TRUE"

 				ExceptionHandling="FALSE"

 				RuntimeLibrary="2"

@@ -92,7 +92,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../../include;../ExternalAPI"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				ExceptionHandling="FALSE"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

@@ -154,7 +154,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../../include;../ExternalAPI"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				ExceptionHandling="FALSE"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="3"

@@ -222,7 +222,7 @@
 				FavorSizeOrSpeed="2"

 				OmitFramePointers="FALSE"

 				OptimizeForProcessor="0"

-				AdditionalIncludeDirectories="../../include;../ExternalAPI"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				StringPooling="TRUE"

 				ExceptionHandling="FALSE"

 				RuntimeLibrary="2"

diff --git a/MenuItemEx/menuex_10.vcxproj b/MenuItemEx/menuex_10.vcxproj
index 9315bac..b0dae91 100644
--- a/MenuItemEx/menuex_10.vcxproj
+++ b/MenuItemEx/menuex_10.vcxproj
@@ -65,7 +65,6 @@
     <UseOfMfc>false</UseOfMfc>

     <CharacterSet>Unicode</CharacterSet>

     <WholeProgramOptimization>true</WholeProgramOptimization>

-    <PlatformToolset>v90</PlatformToolset>

   </PropertyGroup>

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

     <ConfigurationType>DynamicLibrary</ConfigurationType>

@@ -115,26 +114,26 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)/Plugins\</OutDir>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -176,11 +175,11 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <WholeProgramOptimization>true</WholeProgramOptimization>

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

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

       <StringPooling>true</StringPooling>

       <ExceptionHandling>

       </ExceptionHandling>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <PrecompiledHeader>

       </PrecompiledHeader>

@@ -224,11 +223,11 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <WholeProgramOptimization>true</WholeProgramOptimization>

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

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

       <StringPooling>true</StringPooling>

       <ExceptionHandling>

       </ExceptionHandling>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <PrecompiledHeader>

       </PrecompiledHeader>

@@ -269,10 +268,10 @@
     </Midl>

     <ClCompile>

       <Optimization>Disabled</Optimization>

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

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

       <ExceptionHandling>

       </ExceptionHandling>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

       <PrecompiledHeader>

       </PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

@@ -308,10 +307,10 @@
     </Midl>

     <ClCompile>

       <Optimization>Disabled</Optimization>

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

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

       <ExceptionHandling>

       </ExceptionHandling>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

       <PrecompiledHeader>

       </PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

@@ -347,10 +346,10 @@
     </Midl>

     <ClCompile>

       <Optimization>Disabled</Optimization>

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

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

       <ExceptionHandling>

       </ExceptionHandling>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

       <PrecompiledHeader>

       </PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

@@ -386,10 +385,10 @@
     </Midl>

     <ClCompile>

       <Optimization>Disabled</Optimization>

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

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

       <ExceptionHandling>

       </ExceptionHandling>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

       <PrecompiledHeader>

       </PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

@@ -429,11 +428,11 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <WholeProgramOptimization>true</WholeProgramOptimization>

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

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

       <StringPooling>true</StringPooling>

       <ExceptionHandling>

       </ExceptionHandling>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <PrecompiledHeader>

       </PrecompiledHeader>

@@ -476,11 +475,11 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <WholeProgramOptimization>true</WholeProgramOptimization>

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

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

       <StringPooling>true</StringPooling>

       <ExceptionHandling>

       </ExceptionHandling>

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <PrecompiledHeader>

       </PrecompiledHeader>

diff --git a/MenuItemEx/menuex_8.vcproj b/MenuItemEx/menuex_8.vcproj
index 899aee4..187a830 100644
--- a/MenuItemEx/menuex_8.vcproj
+++ b/MenuItemEx/menuex_8.vcproj
@@ -53,7 +53,7 @@
 				FavorSizeOrSpeed="2"

 				OmitFramePointers="true"

 				WholeProgramOptimization="true"

-				AdditionalIncludeDirectories="../../include;../ExternalAPI"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				StringPooling="true"

 				ExceptionHandling="0"

 				RuntimeLibrary="2"

@@ -145,7 +145,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../../include;../ExternalAPI"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				ExceptionHandling="0"

 				RuntimeLibrary="3"

 				UsePrecompiledHeader="0"

@@ -232,7 +232,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../../include;../ExternalAPI"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				ExceptionHandling="0"

 				RuntimeLibrary="3"

 				UsePrecompiledHeader="0"

@@ -323,7 +323,7 @@
 				InlineFunctionExpansion="1"

 				FavorSizeOrSpeed="2"

 				WholeProgramOptimization="true"

-				AdditionalIncludeDirectories="../../include;../ExternalAPI"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				StringPooling="true"

 				ExceptionHandling="0"

 				RuntimeLibrary="2"

diff --git a/MenuItemEx/menuex_9.vcproj b/MenuItemEx/menuex_9.vcproj
index dabc2b2..a769514 100644
--- a/MenuItemEx/menuex_9.vcproj
+++ b/MenuItemEx/menuex_9.vcproj
@@ -54,7 +54,7 @@
 				InlineFunctionExpansion="1"

 				FavorSizeOrSpeed="2"

 				WholeProgramOptimization="true"

-				AdditionalIncludeDirectories="../../include;../ExternalAPI"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				StringPooling="true"

 				ExceptionHandling="0"

 				RuntimeLibrary="2"

@@ -151,7 +151,7 @@
 				InlineFunctionExpansion="1"

 				FavorSizeOrSpeed="2"

 				WholeProgramOptimization="true"

-				AdditionalIncludeDirectories="../../include;../ExternalAPI"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				StringPooling="true"

 				ExceptionHandling="0"

 				RuntimeLibrary="2"

@@ -244,7 +244,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../../include;../ExternalAPI"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				ExceptionHandling="0"

 				RuntimeLibrary="3"

 				UsePrecompiledHeader="0"

@@ -330,7 +330,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../../include;../ExternalAPI"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				ExceptionHandling="0"

 				RuntimeLibrary="3"

 				UsePrecompiledHeader="0"

@@ -417,7 +417,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../../include;../ExternalAPI"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				ExceptionHandling="0"

 				RuntimeLibrary="3"

 				UsePrecompiledHeader="0"

@@ -504,7 +504,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="../../include;../ExternalAPI"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				ExceptionHandling="0"

 				RuntimeLibrary="3"

 				UsePrecompiledHeader="0"

@@ -596,7 +596,7 @@
 				InlineFunctionExpansion="1"

 				FavorSizeOrSpeed="2"

 				WholeProgramOptimization="true"

-				AdditionalIncludeDirectories="../../include;../ExternalAPI"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				StringPooling="true"

 				ExceptionHandling="0"

 				RuntimeLibrary="2"

@@ -692,7 +692,7 @@
 				InlineFunctionExpansion="1"

 				FavorSizeOrSpeed="2"

 				WholeProgramOptimization="true"

-				AdditionalIncludeDirectories="../../include;../ExternalAPI"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				StringPooling="true"

 				ExceptionHandling="0"

 				RuntimeLibrary="2"