NoHistory and NotesAndReminders added to full slns

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

19 files changed, 90 insertions, 73 deletions

diff --git a/plugins/NoHistory/NoHistory.vcxproj b/plugins/NoHistory/NoHistory.vcxproj
index 4992dbd857..9e00650a58 100644
--- a/plugins/NoHistory/NoHistory.vcxproj
+++ b/plugins/NoHistory/NoHistory.vcxproj
@@ -61,10 +61,10 @@
   <PropertyGroup Label="UserMacros" />

   <PropertyGroup>

     <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>

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

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

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

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

+    <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)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir>

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

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

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

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

@@ -73,15 +73,19 @@
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>

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

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

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

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

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

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

   </PropertyGroup>

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

     <ClCompile>

-      <Optimization>Full</Optimization>

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

+      <Optimization>Disabled</Optimization>

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

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

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>

       <WarningLevel>Level3</WarningLevel>

@@ -97,12 +101,15 @@
       <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

     </Link>

+    <ResourceCompile>

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

+    </ResourceCompile>

   </ItemDefinitionGroup>

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

     <ClCompile>

       <Optimization>Full</Optimization>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

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

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

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

       <StringPooling>true</StringPooling>

       <ExceptionHandling>

@@ -116,6 +123,7 @@
       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

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

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

     </ClCompile>

     <Link>

       <AdditionalDependencies>Comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

@@ -127,19 +135,23 @@
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

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

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <AdditionalOptions>/PDBALTPATH:%_PDB% %(AdditionalOptions)</AdditionalOptions>

     </Link>

+    <ResourceCompile>

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

+    </ResourceCompile>

   </ItemDefinitionGroup>

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

     <Midl>

       <TargetEnvironment>X64</TargetEnvironment>

     </Midl>

     <ClCompile>

-      <Optimization>Full</Optimization>

+      <Optimization>Disabled</Optimization>

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

       <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;NOHISTORY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>common.h</PrecompiledHeaderFile>

       <WarningLevel>Level3</WarningLevel>

@@ -155,6 +167,9 @@
       <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

     </Link>

+    <ResourceCompile>

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

+    </ResourceCompile>

   </ItemDefinitionGroup>

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

     <Midl>

@@ -177,6 +192,7 @@
       <WarningLevel>Level3</WarningLevel>

       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

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

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

     </ClCompile>

     <Link>

       <AdditionalDependencies>Comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

@@ -188,44 +204,35 @@
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

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

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <AdditionalOptions>/PDBALTPATH:%_PDB% %(AdditionalOptions)</AdditionalOptions>

     </Link>

+    <ResourceCompile>

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

+    </ResourceCompile>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClCompile Include="dllmain.cpp">

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>

-    </ClCompile>

-    <ClCompile Include="icons.cpp" />

-    <ClCompile Include="options.cpp" />

-  </ItemGroup>

-  <ItemGroup>

-    <ClInclude Include="common.h" />

-    <ClInclude Include="icons.h" />

-    <ClInclude Include="options.h" />

-    <ClInclude Include="private.h" />

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

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

+      <ExcludedFromBuild>true</ExcludedFromBuild>

+    </ResourceCompile>

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

+      <ExcludedFromBuild>true</ExcludedFromBuild>

+    </ResourceCompile>

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

   </ItemGroup>

   <ItemGroup>

-    <None Include="history_clear.ico" />

-    <None Include="history_disabled.ico" />

-    <None Include="history_enabled.ico" />

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

+      <PrecompiledHeader>Create</PrecompiledHeader>

+    </ClCompile>

+    <ClCompile Include="src\icons.cpp" />

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

+    <ClCompile Include="src\dllmain.cpp" />

   </ItemGroup>

   <ItemGroup>

-    <ResourceCompile Include="NoHistory.rc">

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

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

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

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

-    </ResourceCompile>

-    <ResourceCompile Include="private.rc">

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

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

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

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

-    </ResourceCompile>

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

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

+    <ClInclude Include="src\icons.h" />

+    <ClInclude Include="src\options.h" />

+    <ClInclude Include="src\private.h" />

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

   </ItemGroup>

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

   <ImportGroup Label="ExtensionTargets">

diff --git a/plugins/NoHistory/NoHistory.vcxproj.filters b/plugins/NoHistory/NoHistory.vcxproj.filters
index 1fa1822595..410d909093 100644
--- a/plugins/NoHistory/NoHistory.vcxproj.filters
+++ b/plugins/NoHistory/NoHistory.vcxproj.filters
@@ -15,53 +15,45 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="dllmain.cpp">

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

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

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

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

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

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+  </ItemGroup>

+  <ItemGroup>

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

+      <Filter>Source Files</Filter>

+    </ClCompile>

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="icons.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="options.cpp">

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

       <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="common.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="icons.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="options.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="private.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="resource.h">

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

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>

-  <ItemGroup>

-    <None Include="history_clear.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="history_disabled.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-    <None Include="history_enabled.ico">

-      <Filter>Resource Files</Filter>

-    </None>

-  </ItemGroup>

-  <ItemGroup>

-    <ResourceCompile Include="NoHistory.rc">

-      <Filter>Resource Files</Filter>

-    </ResourceCompile>

-    <ResourceCompile Include="private.rc">

-      <Filter>Resource Files</Filter>

-    </ResourceCompile>

-    <ResourceCompile Include="resource.rc">

-      <Filter>Resource Files</Filter>

-    </ResourceCompile>

-  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/plugins/NoHistory/private.aps b/plugins/NoHistory/private.aps
deleted file mode 100644
index 01a3adcadc..0000000000
--- a/plugins/NoHistory/private.aps
+++ /dev/null
diff --git a/plugins/NoHistory/NoHistory.rc b/plugins/NoHistory/res/NoHistory.rc
index 485ca27bd6..d24f904c35 100644
--- a/plugins/NoHistory/NoHistory.rc
+++ b/plugins/NoHistory/res/NoHistory.rc
@@ -1,6 +1,6 @@
 //Microsoft Developer Studio generated resource script.

 //

-#include "resource.h"

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

 

 #define APSTUDIO_READONLY_SYMBOLS

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

diff --git a/plugins/NoHistory/history_clear.ico b/plugins/NoHistory/res/history_clear.ico
index 1a95f86f20..1a95f86f20 100644
--- a/plugins/NoHistory/history_clear.ico
+++ b/plugins/NoHistory/res/history_clear.ico
diff --git a/plugins/NoHistory/history_disabled.ico b/plugins/NoHistory/res/history_disabled.ico
index 27225e24fb..27225e24fb 100644
--- a/plugins/NoHistory/history_disabled.ico
+++ b/plugins/NoHistory/res/history_disabled.ico
diff --git a/plugins/NoHistory/history_enabled.ico b/plugins/NoHistory/res/history_enabled.ico
index cee748347d..cee748347d 100644
--- a/plugins/NoHistory/history_enabled.ico
+++ b/plugins/NoHistory/res/history_enabled.ico
diff --git a/plugins/NoHistory/private.rc b/plugins/NoHistory/res/private.rc
index 47bca39ef1..0cf871117d 100644
--- a/plugins/NoHistory/private.rc
+++ b/plugins/NoHistory/res/private.rc
@@ -1,7 +1,7 @@
 /* THIS FILE WILL BE OVERWRITTEN BY DEV-C++ */

 /* DO NOT EDIT! */

 

-#include "private.h"

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

 #include "afxres.h"

 //

 // TO CHANGE VERSION INFORMATION, EDIT PROJECT OPTIONS...

diff --git a/plugins/NoHistory/resource.rc b/plugins/NoHistory/res/resource.rc
index 12fdadcee4..12fdadcee4 100644
--- a/plugins/NoHistory/resource.rc
+++ b/plugins/NoHistory/res/resource.rc
diff --git a/plugins/NoHistory/resource.aps b/plugins/NoHistory/resource.aps
deleted file mode 100644
index 5d72483fde..0000000000
--- a/plugins/NoHistory/resource.aps
+++ /dev/null
diff --git a/plugins/NoHistory/common.h b/plugins/NoHistory/src/common.h
index 060be9624a..060be9624a 100644
--- a/plugins/NoHistory/common.h
+++ b/plugins/NoHistory/src/common.h
diff --git a/plugins/NoHistory/dllmain.cpp b/plugins/NoHistory/src/dllmain.cpp
index 2a76dc620a..2a76dc620a 100644
--- a/plugins/NoHistory/dllmain.cpp
+++ b/plugins/NoHistory/src/dllmain.cpp
diff --git a/plugins/NoHistory/icons.cpp b/plugins/NoHistory/src/icons.cpp
index 6bfff6a424..6bfff6a424 100644
--- a/plugins/NoHistory/icons.cpp
+++ b/plugins/NoHistory/src/icons.cpp
diff --git a/plugins/NoHistory/icons.h b/plugins/NoHistory/src/icons.h
index 88fae4be67..88fae4be67 100644
--- a/plugins/NoHistory/icons.h
+++ b/plugins/NoHistory/src/icons.h
diff --git a/plugins/NoHistory/options.cpp b/plugins/NoHistory/src/options.cpp
index 45b2c876eb..45b2c876eb 100644
--- a/plugins/NoHistory/options.cpp
+++ b/plugins/NoHistory/src/options.cpp
diff --git a/plugins/NoHistory/options.h b/plugins/NoHistory/src/options.h
index f9825ce47c..f9825ce47c 100644
--- a/plugins/NoHistory/options.h
+++ b/plugins/NoHistory/src/options.h
diff --git a/plugins/NoHistory/private.h b/plugins/NoHistory/src/private.h
index 535dd34c5f..535dd34c5f 100644
--- a/plugins/NoHistory/private.h
+++ b/plugins/NoHistory/src/private.h
diff --git a/plugins/NoHistory/resource.h b/plugins/NoHistory/src/resource.h
index 5640d91b59..5640d91b59 100644
--- a/plugins/NoHistory/resource.h
+++ b/plugins/NoHistory/src/resource.h
diff --git a/plugins/NoHistory/src/stdafx.cpp b/plugins/NoHistory/src/stdafx.cpp
new file mode 100644
index 0000000000..83f7fcf281
--- /dev/null
+++ b/plugins/NoHistory/src/stdafx.cpp
@@ -0,0 +1,18 @@
+/*

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

+

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

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

+as published by the Free Software Foundation version 2

+of the License.

+

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

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

+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+GNU General Public License for more details.

+

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

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

+*/

+

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