another part of small project fixes and x64 adaptation in some cases

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

5 files changed, 57 insertions, 31 deletions

diff --git a/TooltipNotify/src/main.rc b/TooltipNotify/src/main.rc
index 958bc49..fe1fbad 100644
--- a/TooltipNotify/src/main.rc
+++ b/TooltipNotify/src/main.rc
@@ -198,7 +198,7 @@ END
 //

 // Generated from the TEXTINCLUDE 3 resource.

 //

-#include "version.rc2"

+#include "version.rc"

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

 #endif    // not APSTUDIO_INVOKED

 

diff --git a/TooltipNotify/ttnotify.vcproj b/TooltipNotify/ttnotify.vcproj
index 7a318a0..e90c886 100644
--- a/TooltipNotify/ttnotify.vcproj
+++ b/TooltipNotify/ttnotify.vcproj
@@ -44,7 +44,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories=""

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

 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TTNOTIFY_EXPORTS"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

@@ -125,7 +125,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="1"

-				AdditionalIncludeDirectories=""

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

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TTNOTIFY_EXPORTS"

 				RuntimeLibrary="0"

 				UsePrecompiledHeader="0"

@@ -207,7 +207,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories=""

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

 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TTNOTIFY_EXPORTS"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

@@ -291,7 +291,7 @@
 				InlineFunctionExpansion="2"

 				EnableIntrinsicFunctions="true"

 				FavorSizeOrSpeed="2"

-				AdditionalIncludeDirectories=""

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

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TTNOTIFY_EXPORTS"

 				RuntimeLibrary="0"

 				EnableEnhancedInstructionSet="2"

diff --git a/TooltipNotify/ttnotify_10.sln b/TooltipNotify/ttnotify_10.sln
new file mode 100644
index 0000000..16bad20
--- /dev/null
+++ b/TooltipNotify/ttnotify_10.sln
@@ -0,0 +1,25 @@
+Microsoft Visual Studio Solution File, Format Version 11.00

+# Visual Studio 2010

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttnotify", "ttnotify_10.vcxproj", "{1948EAEA-4C25-4F6B-AD9E-5891F656EADA}"

+EndProject

+Global

+	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+		Debug|Win32 = Debug|Win32

+		Debug-Unicode|Win32 = Debug-Unicode|Win32

+		Release|Win32 = Release|Win32

+		Release-Unicode|Win32 = Release-Unicode|Win32

+	EndGlobalSection

+	GlobalSection(ProjectConfigurationPlatforms) = postSolution

+		{1948EAEA-4C25-4F6B-AD9E-5891F656EADA}.Debug|Win32.ActiveCfg = Debug|Win32

+		{1948EAEA-4C25-4F6B-AD9E-5891F656EADA}.Debug|Win32.Build.0 = Debug|Win32

+		{1948EAEA-4C25-4F6B-AD9E-5891F656EADA}.Debug-Unicode|Win32.ActiveCfg = Debug-Unicode|Win32

+		{1948EAEA-4C25-4F6B-AD9E-5891F656EADA}.Debug-Unicode|Win32.Build.0 = Debug-Unicode|Win32

+		{1948EAEA-4C25-4F6B-AD9E-5891F656EADA}.Release|Win32.ActiveCfg = Release|Win32

+		{1948EAEA-4C25-4F6B-AD9E-5891F656EADA}.Release|Win32.Build.0 = Release|Win32

+		{1948EAEA-4C25-4F6B-AD9E-5891F656EADA}.Release-Unicode|Win32.ActiveCfg = Release-Unicode|Win32

+		{1948EAEA-4C25-4F6B-AD9E-5891F656EADA}.Release-Unicode|Win32.Build.0 = Release-Unicode|Win32

+	EndGlobalSection

+	GlobalSection(SolutionProperties) = preSolution

+		HideSolutionNode = FALSE

+	EndGlobalSection

+EndGlobal

diff --git a/TooltipNotify/ttnotify_10.vcxproj b/TooltipNotify/ttnotify_10.vcxproj
index 91fb58e..0fc5494 100644
--- a/TooltipNotify/ttnotify_10.vcxproj
+++ b/TooltipNotify/ttnotify_10.vcxproj
@@ -37,6 +37,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

     <ConfigurationType>DynamicLibrary</ConfigurationType>

     <CharacterSet>MultiByte</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

   </PropertyGroup>

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

     <ConfigurationType>DynamicLibrary</ConfigurationType>

@@ -64,17 +65,17 @@
   <PropertyGroup Label="UserMacros" />

   <PropertyGroup>

     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>

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

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

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

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

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

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

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

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

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

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

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

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug-Unicode|Win32'">bin/$(Configuration)\</IntDir>

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

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

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

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

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

+    <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'">false</LinkIncremental>

     <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release-Unicode|Win32'">D:\SVN\Miranda\Trunk\miranda\include;$(IncludePath)</IncludePath>

   </PropertyGroup>

@@ -85,7 +86,7 @@
     </PreBuildEvent>

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

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

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

@@ -96,7 +97,6 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

     </ClCompile>

     <Link>

-      <OutputFile>$(OutDir)ttnotify.dll</OutputFile>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <ProgramDatabaseFile>$(OutDir)ttnotify.pdb</ProgramDatabaseFile>

       <SubSystem>Windows</SubSystem>

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

       </DataExecutionPrevention>

       <TargetMachine>MachineX86</TargetMachine>

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

     </Link>

   </ItemDefinitionGroup>

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

@@ -112,18 +113,20 @@
       <Command>SubWCRev . src\version.wcr src\version.h</Command>

     </PreBuildEvent>

     <ClCompile>

-      <Optimization>MinSpace</Optimization>

-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <Optimization>Full</Optimization>

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

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

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

       <PrecompiledHeader>

       </PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+      <IntrinsicFunctions>true</IntrinsicFunctions>

     </ClCompile>

     <Link>

       <ShowProgress>NotSet</ShowProgress>

-      <OutputFile>$(OutDir)ttnotify.dll</OutputFile>

       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Windows</SubSystem>

@@ -132,7 +135,7 @@
       <RandomizedBaseAddress>false</RandomizedBaseAddress>

       <DataExecutionPrevention>

       </DataExecutionPrevention>

-      <ImportLibrary>$(OutDir)ttnotify.lib</ImportLibrary>

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

       <TargetMachine>MachineX86</TargetMachine>

     </Link>

   </ItemDefinitionGroup>

@@ -143,7 +146,7 @@
     </PreBuildEvent>

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

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

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

@@ -154,14 +157,13 @@
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

     </ClCompile>

     <Link>

-      <OutputFile>$(OutDir)ttnotify.dll</OutputFile>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <ProgramDatabaseFile>$(OutDir)ttnotify.pdb</ProgramDatabaseFile>

       <SubSystem>Windows</SubSystem>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

       <DataExecutionPrevention>

       </DataExecutionPrevention>

-      <ImportLibrary>$(OutDir)ttnotify.lib</ImportLibrary>

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

       <TargetMachine>MachineX86</TargetMachine>

     </Link>

   </ItemDefinitionGroup>

@@ -172,14 +174,13 @@
     </PreBuildEvent>

     <ClCompile>

       <Optimization>Full</Optimization>

-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <IntrinsicFunctions>true</IntrinsicFunctions>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <WholeProgramOptimization>true</WholeProgramOptimization>

-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

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

-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

       <FloatingPointModel>Fast</FloatingPointModel>

       <PrecompiledHeader>

       </PrecompiledHeader>

@@ -189,7 +190,6 @@
     </ClCompile>

     <Link>

       <ShowProgress>NotSet</ShowProgress>

-      <OutputFile>$(OutDir)ttnotify.dll</OutputFile>

       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <SubSystem>Windows</SubSystem>

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

       </DataExecutionPrevention>

       <TargetMachine>MachineX86</TargetMachine>

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

     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/TooltipNotify/ttnotify_8.vcproj b/TooltipNotify/ttnotify_8.vcproj
index 7ff7a7d..e80bab2 100644
--- a/TooltipNotify/ttnotify_8.vcproj
+++ b/TooltipNotify/ttnotify_8.vcproj
@@ -44,7 +44,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories=""

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

 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TTNOTIFY_EXPORTS"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

@@ -124,7 +124,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="1"

-				AdditionalIncludeDirectories=""

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

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TTNOTIFY_EXPORTS"

 				RuntimeLibrary="0"

 				UsePrecompiledHeader="0"

@@ -206,7 +206,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories=""

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

 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TTNOTIFY_EXPORTS"

 				MinimalRebuild="true"

 				BasicRuntimeChecks="3"

@@ -291,7 +291,7 @@
 				EnableIntrinsicFunctions="true"

 				FavorSizeOrSpeed="2"

 				WholeProgramOptimization="true"

-				AdditionalIncludeDirectories=""

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

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TTNOTIFY_EXPORTS;_CRT_SECURE_NO_WARNINGS"

 				RuntimeLibrary="0"

 				EnableEnhancedInstructionSet="2"