diff options
| -rw-r--r-- | bin10/mir_full.sln | 20 | ||||
| -rw-r--r-- | bin10/mir_full_pro.sln | 22 | ||||
| -rw-r--r-- | plugins/NoHistory/NoHistory.vcxproj | 89 | ||||
| -rw-r--r-- | plugins/NoHistory/NoHistory.vcxproj.filters | 52 | ||||
| -rw-r--r-- | plugins/NoHistory/private.aps | bin | 18964 -> 0 bytes | |||
| -rw-r--r-- | plugins/NoHistory/res/NoHistory.rc (renamed from plugins/NoHistory/NoHistory.rc) | 2 | ||||
| -rw-r--r-- | plugins/NoHistory/res/history_clear.ico (renamed from plugins/NoHistory/history_clear.ico) | bin | 2550 -> 2550 bytes | |||
| -rw-r--r-- | plugins/NoHistory/res/history_disabled.ico (renamed from plugins/NoHistory/history_disabled.ico) | bin | 2550 -> 2550 bytes | |||
| -rw-r--r-- | plugins/NoHistory/res/history_enabled.ico (renamed from plugins/NoHistory/history_enabled.ico) | bin | 2550 -> 2550 bytes | |||
| -rw-r--r-- | plugins/NoHistory/res/private.rc (renamed from plugins/NoHistory/private.rc) | 2 | ||||
| -rw-r--r-- | plugins/NoHistory/res/resource.rc (renamed from plugins/NoHistory/resource.rc) | 0 | ||||
| -rw-r--r-- | plugins/NoHistory/resource.aps | bin | 30164 -> 0 bytes | |||
| -rw-r--r-- | plugins/NoHistory/src/common.h (renamed from plugins/NoHistory/common.h) | 0 | ||||
| -rw-r--r-- | plugins/NoHistory/src/dllmain.cpp (renamed from plugins/NoHistory/dllmain.cpp) | 0 | ||||
| -rw-r--r-- | plugins/NoHistory/src/icons.cpp (renamed from plugins/NoHistory/icons.cpp) | 0 | ||||
| -rw-r--r-- | plugins/NoHistory/src/icons.h (renamed from plugins/NoHistory/icons.h) | 0 | ||||
| -rw-r--r-- | plugins/NoHistory/src/options.cpp (renamed from plugins/NoHistory/options.cpp) | 0 | ||||
| -rw-r--r-- | plugins/NoHistory/src/options.h (renamed from plugins/NoHistory/options.h) | 0 | ||||
| -rw-r--r-- | plugins/NoHistory/src/private.h (renamed from plugins/NoHistory/private.h) | 0 | ||||
| -rw-r--r-- | plugins/NoHistory/src/resource.h (renamed from plugins/NoHistory/resource.h) | 0 | ||||
| -rw-r--r-- | plugins/NoHistory/src/stdafx.cpp | 18 | ||||
| -rw-r--r-- | plugins/NotesAndReminders/NotesReminders.vcxproj | 13 | ||||
| -rw-r--r-- | plugins/NotesAndReminders/NotesReminders.vcxproj.filters | 3 | ||||
| -rw-r--r-- | plugins/NotesAndReminders/src/stdafx.cpp | 18 |
24 files changed, 163 insertions, 76 deletions
diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln index ad82a54d71..b1fe2c7f1f 100644 --- a/bin10/mir_full.sln +++ b/bin10/mir_full.sln @@ -351,6 +351,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Xfire", "..\protocols\Xfire EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MobileState", "..\plugins\MobileState\mobilestate_10.vcxproj", "{AE677E3A-DAC5-42FD-8762-47370C57639B}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NoHistory", "..\plugins\NoHistory\NoHistory.vcxproj", "{ABF05E2C-C335-4BD1-8C3E-4C63285362CF}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NotesReminders", "..\plugins\NotesAndReminders\NotesReminders.vcxproj", "{EEB57129-946C-4B98-8856-FDA501AE2A5E}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -1550,6 +1554,22 @@ Global {AE677E3A-DAC5-42FD-8762-47370C57639B}.Release|Win32.Build.0 = Release|Win32
{AE677E3A-DAC5-42FD-8762-47370C57639B}.Release|x64.ActiveCfg = Release|x64
{AE677E3A-DAC5-42FD-8762-47370C57639B}.Release|x64.Build.0 = Release|x64
+ {ABF05E2C-C335-4BD1-8C3E-4C63285362CF}.Debug|Win32.ActiveCfg = Debug|Win32
+ {ABF05E2C-C335-4BD1-8C3E-4C63285362CF}.Debug|Win32.Build.0 = Debug|Win32
+ {ABF05E2C-C335-4BD1-8C3E-4C63285362CF}.Debug|x64.ActiveCfg = Debug|x64
+ {ABF05E2C-C335-4BD1-8C3E-4C63285362CF}.Debug|x64.Build.0 = Debug|x64
+ {ABF05E2C-C335-4BD1-8C3E-4C63285362CF}.Release|Win32.ActiveCfg = Release|Win32
+ {ABF05E2C-C335-4BD1-8C3E-4C63285362CF}.Release|Win32.Build.0 = Release|Win32
+ {ABF05E2C-C335-4BD1-8C3E-4C63285362CF}.Release|x64.ActiveCfg = Release|x64
+ {ABF05E2C-C335-4BD1-8C3E-4C63285362CF}.Release|x64.Build.0 = Release|x64
+ {EEB57129-946C-4B98-8856-FDA501AE2A5E}.Debug|Win32.ActiveCfg = Debug|Win32
+ {EEB57129-946C-4B98-8856-FDA501AE2A5E}.Debug|Win32.Build.0 = Debug|Win32
+ {EEB57129-946C-4B98-8856-FDA501AE2A5E}.Debug|x64.ActiveCfg = Debug|x64
+ {EEB57129-946C-4B98-8856-FDA501AE2A5E}.Debug|x64.Build.0 = Debug|x64
+ {EEB57129-946C-4B98-8856-FDA501AE2A5E}.Release|Win32.ActiveCfg = Release|Win32
+ {EEB57129-946C-4B98-8856-FDA501AE2A5E}.Release|Win32.Build.0 = Release|Win32
+ {EEB57129-946C-4B98-8856-FDA501AE2A5E}.Release|x64.ActiveCfg = Release|x64
+ {EEB57129-946C-4B98-8856-FDA501AE2A5E}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/bin10/mir_full_pro.sln b/bin10/mir_full_pro.sln index 94d1cc61ad..8fbc88b7bb 100644 --- a/bin10/mir_full_pro.sln +++ b/bin10/mir_full_pro.sln @@ -390,6 +390,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Xfire", "..\protocols\Xfire EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MobileState", "..\plugins\MobileState\mobilestate_10.vcxproj", "{AE677E3A-DAC5-42FD-8762-47370C57639B}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NoHistory", "..\plugins\NoHistory\NoHistory.vcxproj", "{ABF05E2C-C335-4BD1-8C3E-4C63285362CF}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NotesReminders", "..\plugins\NotesAndReminders\NotesReminders.vcxproj", "{EEB57129-946C-4B98-8856-FDA501AE2A5E}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -1589,6 +1593,22 @@ Global {AE677E3A-DAC5-42FD-8762-47370C57639B}.Release|Win32.Build.0 = Release|Win32
{AE677E3A-DAC5-42FD-8762-47370C57639B}.Release|x64.ActiveCfg = Release|x64
{AE677E3A-DAC5-42FD-8762-47370C57639B}.Release|x64.Build.0 = Release|x64
+ {ABF05E2C-C335-4BD1-8C3E-4C63285362CF}.Debug|Win32.ActiveCfg = Debug|Win32
+ {ABF05E2C-C335-4BD1-8C3E-4C63285362CF}.Debug|Win32.Build.0 = Debug|Win32
+ {ABF05E2C-C335-4BD1-8C3E-4C63285362CF}.Debug|x64.ActiveCfg = Debug|x64
+ {ABF05E2C-C335-4BD1-8C3E-4C63285362CF}.Debug|x64.Build.0 = Debug|x64
+ {ABF05E2C-C335-4BD1-8C3E-4C63285362CF}.Release|Win32.ActiveCfg = Release|Win32
+ {ABF05E2C-C335-4BD1-8C3E-4C63285362CF}.Release|Win32.Build.0 = Release|Win32
+ {ABF05E2C-C335-4BD1-8C3E-4C63285362CF}.Release|x64.ActiveCfg = Release|x64
+ {ABF05E2C-C335-4BD1-8C3E-4C63285362CF}.Release|x64.Build.0 = Release|x64
+ {EEB57129-946C-4B98-8856-FDA501AE2A5E}.Debug|Win32.ActiveCfg = Debug|Win32
+ {EEB57129-946C-4B98-8856-FDA501AE2A5E}.Debug|Win32.Build.0 = Debug|Win32
+ {EEB57129-946C-4B98-8856-FDA501AE2A5E}.Debug|x64.ActiveCfg = Debug|x64
+ {EEB57129-946C-4B98-8856-FDA501AE2A5E}.Debug|x64.Build.0 = Debug|x64
+ {EEB57129-946C-4B98-8856-FDA501AE2A5E}.Release|Win32.ActiveCfg = Release|Win32
+ {EEB57129-946C-4B98-8856-FDA501AE2A5E}.Release|Win32.Build.0 = Release|Win32
+ {EEB57129-946C-4B98-8856-FDA501AE2A5E}.Release|x64.ActiveCfg = Release|x64
+ {EEB57129-946C-4B98-8856-FDA501AE2A5E}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -1689,6 +1709,7 @@ Global {A4855451-6447-437C-B024-B36C3C7901EA} = {03FBFF5D-0539-4C51-B7C2-B8CFF9DEA649}
{7FC00D59-03D3-4A6C-AEFE-67349C9C9E10} = {03FBFF5D-0539-4C51-B7C2-B8CFF9DEA649}
{AE677E3A-DAC5-42FD-8762-47370C57639B} = {03FBFF5D-0539-4C51-B7C2-B8CFF9DEA649}
+ {EEB57129-946C-4B98-8856-FDA501AE2A5E} = {03FBFF5D-0539-4C51-B7C2-B8CFF9DEA649}
{8CEBD7AC-CD02-4BEC-B889-A7243F3E5DD8} = {99B819F8-65D9-45BC-B0C4-8C2B0F63AD46}
{D726A7E5-CF4C-4CF2-A2D3-073DECEC0260} = {99B819F8-65D9-45BC-B0C4-8C2B0F63AD46}
{EFD45F48-63D5-48AE-96CD-8ADB3545A4EE} = {99B819F8-65D9-45BC-B0C4-8C2B0F63AD46}
@@ -1732,6 +1753,7 @@ Global {7A50C5F4-866B-B8BD-D5FA-0EE6745194C6} = {8BAD5E57-11F5-4C44-8FFA-D589B658421B}
{850EC838-0EAD-45EB-6F1B-16DC90DCE18D} = {8BAD5E57-11F5-4C44-8FFA-D589B658421B}
{4CE78D43-FF23-4134-A5AC-B2CF0F8D9F3B} = {8BAD5E57-11F5-4C44-8FFA-D589B658421B}
+ {ABF05E2C-C335-4BD1-8C3E-4C63285362CF} = {8BAD5E57-11F5-4C44-8FFA-D589B658421B}
{726460C7-E1F1-4C37-B64F-DA8A8DD26D70} = {31B8FE37-AC37-40AC-85AC-78B04C2CAC17}
{E26D2311-C164-48CF-BA24-5CEDA873D1B2} = {31B8FE37-AC37-40AC-85AC-78B04C2CAC17}
{B6FC188B-8E54-4197-9444-8BADE9AA75E2} = {31B8FE37-AC37-40AC-85AC-78B04C2CAC17}
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 Binary files differdeleted 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differdeleted 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 diff --git a/plugins/NotesAndReminders/NotesReminders.vcxproj b/plugins/NotesAndReminders/NotesReminders.vcxproj index c19719ddaa..8b7ad075f2 100644 --- a/plugins/NotesAndReminders/NotesReminders.vcxproj +++ b/plugins/NotesAndReminders/NotesReminders.vcxproj @@ -60,14 +60,18 @@ <PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)\Plugins\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
<IgnoreImportLibrary>true</IgnoreImportLibrary>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@@ -148,6 +152,7 @@ <SubSystem>Windows</SubSystem>
<AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <AdditionalOptions>/PDBALTPATH:%_PDB% %(AdditionalOptions)</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -177,17 +182,19 @@ <SubSystem>Windows</SubSystem>
<AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <AdditionalOptions>/PDBALTPATH:%_PDB% %(AdditionalOptions)</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="src\hotkeys.cpp" />
- <ClCompile Include="src\main.cpp">
+ <ClCompile Include="src\stdafx.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="src\miscutils.cpp" />
<ClCompile Include="src\notes.cpp" />
<ClCompile Include="src\options.cpp" />
<ClCompile Include="src\reminders.cpp" />
+ <ClCompile Include="src\main.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\globals.h" />
diff --git a/plugins/NotesAndReminders/NotesReminders.vcxproj.filters b/plugins/NotesAndReminders/NotesReminders.vcxproj.filters index 5eccb5444e..304adc7d25 100644 --- a/plugins/NotesAndReminders/NotesReminders.vcxproj.filters +++ b/plugins/NotesAndReminders/NotesReminders.vcxproj.filters @@ -33,6 +33,9 @@ <ClCompile Include="src\reminders.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="src\stdafx.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\globals.h">
diff --git a/plugins/NotesAndReminders/src/stdafx.cpp b/plugins/NotesAndReminders/src/stdafx.cpp new file mode 100644 index 0000000000..b3b4db2f7e --- /dev/null +++ b/plugins/NotesAndReminders/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 "globals.h"
\ No newline at end of file |