full solution update, minor project fixes

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

7 files changed, 49 insertions, 78 deletions

diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln
index 96a1a440a9..a718da77e0 100644
--- a/bin10/mir_full.sln
+++ b/bin10/mir_full.sln
@@ -208,6 +208,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZeroNotify", "..\plugins\Ze
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KeyboardNotify", "..\plugins\KeyboardNotify\KeyboardNotify_10.vcxproj", "{A9265E36-7F2D-440C-BF3E-F447FDB6200F}"

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AssocMgr", "..\plugins\AssocMgr\assocmgr.vcxproj", "{B57D997C-73E1-D5F7-ECCA-C204345C04A3}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewAwaySys", "..\plugins\NewAwaySysMod\NewAwaySys.vcxproj", "{6A516E27-AC50-5374-756B-A1558DB2EFA9}"

+EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Win32 = Debug|Win32

@@ -993,7 +997,6 @@ Global
 		{C619A811-8023-4441-B3D7-785388A09DF0}.Debug|x64.Build.0 = Debug|x64

 		{C619A811-8023-4441-B3D7-785388A09DF0}.Release|Win32.ActiveCfg = Release|Win32

 		{C619A811-8023-4441-B3D7-785388A09DF0}.Release|x64.ActiveCfg = Release|x64

-		{C619A811-8023-4441-B3D7-785388A09DF0}.Release|x64.Build.0 = Release|x64

 		{E37561EB-B9C5-4215-9FF9-DB559916FBA2}.Debug|Win32.ActiveCfg = Debug|Win32

 		{E37561EB-B9C5-4215-9FF9-DB559916FBA2}.Debug|Win32.Build.0 = Debug|Win32

 		{E37561EB-B9C5-4215-9FF9-DB559916FBA2}.Debug|x64.ActiveCfg = Debug|x64

@@ -1009,6 +1012,18 @@ Global
 		{A9265E36-7F2D-440C-BF3E-F447FDB6200F}.Release|Win32.ActiveCfg = Release|Win32

 		{A9265E36-7F2D-440C-BF3E-F447FDB6200F}.Release|Win32.Build.0 = Release|Win32

 		{A9265E36-7F2D-440C-BF3E-F447FDB6200F}.Release|x64.ActiveCfg = Release|x64

+		{B57D997C-73E1-D5F7-ECCA-C204345C04A3}.Debug|Win32.ActiveCfg = Debug|Win32

+		{B57D997C-73E1-D5F7-ECCA-C204345C04A3}.Debug|Win32.Build.0 = Debug|Win32

+		{B57D997C-73E1-D5F7-ECCA-C204345C04A3}.Debug|x64.ActiveCfg = Debug|Win32

+		{B57D997C-73E1-D5F7-ECCA-C204345C04A3}.Release|Win32.ActiveCfg = Release|Win32

+		{B57D997C-73E1-D5F7-ECCA-C204345C04A3}.Release|Win32.Build.0 = Release|Win32

+		{B57D997C-73E1-D5F7-ECCA-C204345C04A3}.Release|x64.ActiveCfg = Release|Win32

+		{6A516E27-AC50-5374-756B-A1558DB2EFA9}.Debug|Win32.ActiveCfg = Debug|Win32

+		{6A516E27-AC50-5374-756B-A1558DB2EFA9}.Debug|Win32.Build.0 = Debug|Win32

+		{6A516E27-AC50-5374-756B-A1558DB2EFA9}.Debug|x64.ActiveCfg = Debug|Win32

+		{6A516E27-AC50-5374-756B-A1558DB2EFA9}.Release|Win32.ActiveCfg = Release|Win32

+		{6A516E27-AC50-5374-756B-A1558DB2EFA9}.Release|Win32.Build.0 = Release|Win32

+		{6A516E27-AC50-5374-756B-A1558DB2EFA9}.Release|x64.ActiveCfg = Release|Win32

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/include/m_version.h b/include/m_version.h
index e84bf0cfc5..97566a4e97 100644
--- a/include/m_version.h
+++ b/include/m_version.h
@@ -27,10 +27,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define MIRANDA_MAKE_VERSION(a,b,c,d)   (((((DWORD)(a))&0xFF)<<24)|((((DWORD)(b))&0xFF)<<16)|((((DWORD)(c))&0xFF)<<8)|(((DWORD)(d))&0xFF))

 #endif

 

-#define MIRANDA_VERSION_FILEVERSION 0,92,1,68                                

-#define MIRANDA_VERSION_STRING      "0.92.1.68"                              

-#define MIRANDA_VERSION_DISPLAY     "0.92.1 alpha build #68"                 

-#define MIRANDA_VERSION_DWORD       MIRANDA_MAKE_VERSION(0, 92, 1, 68)       

+#define MIRANDA_VERSION_FILEVERSION 0,92,1,88                                

+#define MIRANDA_VERSION_STRING      "0.92.1.88"                              

+#define MIRANDA_VERSION_DISPLAY     "0.92.1 alpha build #88"                 

+#define MIRANDA_VERSION_DWORD       MIRANDA_MAKE_VERSION(0, 92, 1, 88)       

 #define MIRANDA_VERSION_CORE        MIRANDA_MAKE_VERSION(0, 92, 1, 0)        

 #define MIRANDA_VERSION_CORE_STRING "0.92.1.0"                               

                                                                               

diff --git a/plugins/AssocMgr/AssocMgr.sln b/plugins/AssocMgr/AssocMgr.sln
index b6c81c1a2f..118f594fd7 100644
--- a/plugins/AssocMgr/AssocMgr.sln
+++ b/plugins/AssocMgr/AssocMgr.sln
@@ -1,23 +1,23 @@
 

 Microsoft Visual Studio Solution File, Format Version 11.00

 # Visual Studio 2010

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AssocMgr", "assocmgr.vcxproj", "{065889B7-478C-8E11-E93B-54A6D5A21564}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AssocMgr", "assocmgr.vcxproj", "{B57D997C-73E1-D5F7-ECCA-C204345C04A3}"

 EndProject

 Global

-	GlobalSection(DPCodeReviewSolutionGUID) = preSolution

-		DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}

-	EndGlobalSection

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Win32 = Debug|Win32

 		Release|Win32 = Release|Win32

 	EndGlobalSection

 	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{065889B7-478C-8E11-E93B-54A6D5A21564}.Debug|Win32.ActiveCfg = Debug|Win32

-		{065889B7-478C-8E11-E93B-54A6D5A21564}.Debug|Win32.Build.0 = Debug|Win32

-		{065889B7-478C-8E11-E93B-54A6D5A21564}.Release|Win32.ActiveCfg = Release|Win32

-		{065889B7-478C-8E11-E93B-54A6D5A21564}.Release|Win32.Build.0 = Release|Win32

+		{B57D997C-73E1-D5F7-ECCA-C204345C04A3}.Debug|Win32.ActiveCfg = Debug|Win32

+		{B57D997C-73E1-D5F7-ECCA-C204345C04A3}.Debug|Win32.Build.0 = Debug|Win32

+		{B57D997C-73E1-D5F7-ECCA-C204345C04A3}.Release|Win32.ActiveCfg = Release|Win32

+		{B57D997C-73E1-D5F7-ECCA-C204345C04A3}.Release|Win32.Build.0 = Release|Win32

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

 	EndGlobalSection

+	GlobalSection(DPCodeReviewSolutionGUID) = preSolution

+		DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}

+	EndGlobalSection

 EndGlobal

diff --git a/plugins/AssocMgr/assocmgr.vcxproj b/plugins/AssocMgr/assocmgr.vcxproj
index 780e11cdbf..9f221b75aa 100644
--- a/plugins/AssocMgr/assocmgr.vcxproj
+++ b/plugins/AssocMgr/assocmgr.vcxproj
@@ -83,7 +83,7 @@
   </ItemDefinitionGroup>

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

     <ClCompile>

-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <StringPooling>true</StringPooling>

       <FunctionLevelLinking>true</FunctionLevelLinking>

diff --git a/plugins/AssocMgr/assocmgr.vcxproj.filters b/plugins/AssocMgr/assocmgr.vcxproj.filters
index 7cf75682ed..e89271f3eb 100644
--- a/plugins/AssocMgr/assocmgr.vcxproj.filters
+++ b/plugins/AssocMgr/assocmgr.vcxproj.filters
@@ -70,51 +70,6 @@
     <ClInclude Include="version.h">

       <Filter>Resource Files</Filter>

     </ClInclude>

-    <ClInclude Include="include\m_addcontact.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="include\m_clist.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="include\m_database.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="include\m_icq.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="include\m_langpack.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="include\m_message.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="include\m_options.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="include\m_plugins.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="include\m_protosvc.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="include\m_skin.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="include\m_system.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="include\m_utils.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="include\newpluginapi.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="include\statusmodes.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="include\win2k.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="resource.rc">

diff --git a/plugins/NewAwaySysMod/NewAwaySys.vcxproj b/plugins/NewAwaySysMod/NewAwaySys.vcxproj
index 678d3b1124..f6cb308c46 100644
--- a/plugins/NewAwaySysMod/NewAwaySys.vcxproj
+++ b/plugins/NewAwaySysMod/NewAwaySys.vcxproj
@@ -19,12 +19,13 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

     <ConfigurationType>DynamicLibrary</ConfigurationType>

     <UseOfMfc>false</UseOfMfc>

-    <CharacterSet>MultiByte</CharacterSet>

+    <CharacterSet>Unicode</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

   </PropertyGroup>

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

     <ConfigurationType>DynamicLibrary</ConfigurationType>

     <UseOfMfc>false</UseOfMfc>

-    <CharacterSet>MultiByte</CharacterSet>

+    <CharacterSet>Unicode</CharacterSet>

   </PropertyGroup>

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

   <ImportGroup Label="ExtensionSettings">

@@ -38,11 +39,11 @@
   <PropertyGroup Label="UserMacros" />

   <PropertyGroup>

     <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>

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

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</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'">false</LinkIncremental>

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

-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</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>

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

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

@@ -56,20 +57,15 @@
       <Optimization>Disabled</Optimization>

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

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

-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <PrecompiledHeader>

       </PrecompiledHeader>

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

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

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

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

       <WarningLevel>Level3</WarningLevel>

       <SuppressStartupBanner>true</SuppressStartupBanner>

       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

     </ClCompile>

     <Link>

-      <OutputFile>..\..\bin7\Debug\Plugins\NewAwaySys.dll</OutputFile>

       <SuppressStartupBanner>true</SuppressStartupBanner>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <AssemblyDebug>

@@ -80,7 +76,7 @@
       <MapExports>true</MapExports>

       <EntryPointSymbol>MyDllMain</EntryPointSymbol>

       <BaseAddress>0x325A0000</BaseAddress>

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

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

       <TargetMachine>MachineX86</TargetMachine>

     </Link>

     <Midl>

@@ -111,17 +107,13 @@
       <FunctionLevelLinking>false</FunctionLevelLinking>

       <PrecompiledHeader>

       </PrecompiledHeader>

-      <PrecompiledHeaderOutputFile>.\Release/NewAwaySys.pch</PrecompiledHeaderOutputFile>

-      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>

-      <ObjectFileName>.\Release/</ObjectFileName>

-      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>

       <WarningLevel>Level4</WarningLevel>

       <SuppressStartupBanner>true</SuppressStartupBanner>

       <DebugInformationFormat>

       </DebugInformationFormat>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

     </ClCompile>

     <Link>

-      <OutputFile>..\..\bin7\Debug\Plugins\NewAwaySys.dll</OutputFile>

       <SuppressStartupBanner>true</SuppressStartupBanner>

       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>

       <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>

@@ -132,8 +124,10 @@
       <MapExports>true</MapExports>

       <EntryPointSymbol>MyDllMain</EntryPointSymbol>

       <BaseAddress>0x325A0000</BaseAddress>

-      <ImportLibrary>.\Release/NewAwaySys.lib</ImportLibrary>

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

       <TargetMachine>MachineX86</TargetMachine>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

     </Link>

     <Midl>

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

diff --git a/plugins/Variables/Variables_10.vcxproj b/plugins/Variables/Variables_10.vcxproj
index 4d1667385a..cc0e575985 100644
--- a/plugins/Variables/Variables_10.vcxproj
+++ b/plugins/Variables/Variables_10.vcxproj
@@ -37,6 +37,7 @@
   <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>

@@ -163,11 +164,17 @@
     <ClCompile>

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

       <PreprocessorDefinitions>_WIN64;NDEBUG;_WINDOWS;_USRDLL;VARIABLES_EXPORTS;UNICODE;_WIN32_WINNT=0x0502;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Optimization>Full</Optimization>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+      <IntrinsicFunctions>true</IntrinsicFunctions>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

     </ClCompile>

     <Link>

       <AdditionalDependencies>Pdh.lib;Ws2_32.lib;Delayimp.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <GenerateDebugInformation>true</GenerateDebugInformation>

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

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

     </Link>

   </ItemDefinitionGroup>

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