summaryrefslogtreecommitdiff
path: root/YAMN
diff options
context:
space:
mode:
Diffstat (limited to 'YAMN')
-rw-r--r--YAMN/YAMN_10.vcxproj50
-rw-r--r--YAMN/browser/badconnect.cpp8
-rw-r--r--YAMN/browser/m_browser.h2
-rw-r--r--YAMN/browser/mailbrowser.cpp10
-rw-r--r--YAMN/mails/m_mails.h2
-rw-r--r--YAMN/proto/pop3/pop3comm.h4
-rw-r--r--YAMN/yamn.h4
7 files changed, 34 insertions, 46 deletions
diff --git a/YAMN/YAMN_10.vcxproj b/YAMN/YAMN_10.vcxproj
index a364f45..292e061 100644
--- a/YAMN/YAMN_10.vcxproj
+++ b/YAMN/YAMN_10.vcxproj
@@ -28,6 +28,7 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -38,6 +39,7 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -70,12 +72,12 @@
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)/Obj/$(ProjectName)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)/Release/Plugins\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)/Obj/$(ProjectName)\</IntDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)Release64/Plugins\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)Release64/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>
<ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|x64'">*.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pch%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath)%3b$(TargetDir)$(ProjectName).*%3b$(TargetDir)$(RootNamespace).*</ExtensionsToDeleteOnClean>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)Debug64/Plugins\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)Debug64/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>
<ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">*.obj%3b*.ilk%3b*.tlb%3b*.tli%3b*.tlh%3b*.tmp%3b*.rsp%3b*.pch%3b*.pgc%3b*.pgd%3b*.meta%3b$(TargetPath)%3b$(TargetDir)$(ProjectName).*%3b$(TargetDir)$(RootNamespace).*</ExtensionsToDeleteOnClean>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
@@ -90,11 +92,12 @@
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;_USRDLL;_DEBUG;YAMN_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -122,17 +125,15 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>Full</Optimization>
- <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
<WholeProgramOptimization>true</WholeProgramOptimization>
- <AdditionalIncludeDirectories>../../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;WIN2IN1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<StructMemberAlignment>4Bytes</StructMemberAlignment>
<FunctionLevelLinking>true</FunctionLevelLinking>
- <AssemblerListingLocation>
- </AssemblerListingLocation>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
@@ -155,20 +156,17 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
- <Optimization>MinSpace</Optimization>
- <InlineFunctionExpansion>Default</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>../../include;../../include_API;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <Optimization>Full</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <AdditionalIncludeDirectories>../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WIN9X;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
- <AssemblerListingLocation>
- </AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -177,7 +175,6 @@
<Link>
<AdditionalOptions>/filealign:512 %(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>comctl32.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(RootNamespace).dll</OutputFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<BaseAddress>0x60010000</BaseAddress>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -186,22 +183,16 @@
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine>
</Link>
- <Bscmake>
- <OutputFile>$(OutDir)$(TargetName).bsc</OutputFile>
- </Bscmake>
+ <Bscmake />
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../include;../../include_API;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;YAMN_DEBUG;WIN9X;YAMN_VER_BETA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <AssemblerListingLocation>
- </AssemblerListingLocation>
- <ObjectFileName>$(IntDir)</ObjectFileName>
- <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<BrowseInformation>true</BrowseInformation>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -213,7 +204,6 @@
</ResourceCompile>
<Link>
<AdditionalDependencies>comctl32.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)$(RootNamespace).dll</OutputFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<BaseAddress>0x60010000</BaseAddress>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -222,9 +212,7 @@
<ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
<TargetMachine>MachineX64</TargetMachine>
</Link>
- <Bscmake>
- <OutputFile>$(OutDir)$(TargetName).bsc</OutputFile>
- </Bscmake>
+ <Bscmake />
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="account.cpp" />
diff --git a/YAMN/browser/badconnect.cpp b/YAMN/browser/badconnect.cpp
index 0da087d..4640488 100644
--- a/YAMN/browser/badconnect.cpp
+++ b/YAMN/browser/badconnect.cpp
@@ -12,12 +12,12 @@
#include <m_database.h>
#include <m_popup.h>
#include "../main.h"
-#include "../m_protoplugin.h"
-#include "../m_account.h"
+#include "m_protoplugin.h"
+#include "m_account.h"
#include "../debug.h"
-#include "../m_messages.h"
+#include "m_messages.h"
#include "../mails/m_mails.h"
-#include "../m_yamn.h"
+#include "m_yamn.h"
#include "../resources/resource.h"
#include "m_browser.h"
#include <win2k.h>
diff --git a/YAMN/browser/m_browser.h b/YAMN/browser/m_browser.h
index d4c5191..8b05e3d 100644
--- a/YAMN/browser/m_browser.h
+++ b/YAMN/browser/m_browser.h
@@ -1,7 +1,7 @@
#ifndef __MAILBROWSER_H
#define __MAILBROWSER_H
-#include "../m_account.h"
+#include "m_account.h"
#include "../debug.h"
typedef struct MailBrowserWinParam
diff --git a/YAMN/browser/mailbrowser.cpp b/YAMN/browser/mailbrowser.cpp
index aaa1fbb..c6cba1a 100644
--- a/YAMN/browser/mailbrowser.cpp
+++ b/YAMN/browser/mailbrowser.cpp
@@ -28,14 +28,14 @@
#include <m_database.h>
#include <m_clist.h>
#include <m_popup.h>
-#include "../include/m_kbdnotify.h"
+#include "m_kbdnotify.h"
#include "../main.h"
-#include "../m_protoplugin.h"
-#include "../m_account.h"
+#include "m_protoplugin.h"
+#include "m_account.h"
#include "../debug.h"
-#include "../m_messages.h"
+#include "m_messages.h"
#include "../mails/m_mails.h"
-#include "../m_yamn.h"
+#include "m_yamn.h"
#include "../resources/resource.h"
#include <win2k.h>
diff --git a/YAMN/mails/m_mails.h b/YAMN/mails/m_mails.h
index e1826a1..adcaa56 100644
--- a/YAMN/mails/m_mails.h
+++ b/YAMN/mails/m_mails.h
@@ -3,7 +3,7 @@
#include <windows.h>
#include <tchar.h>
-#include "../m_account.h"
+#include "m_account.h"
//
//================================== OTHER DEFINITIONS ========================================
diff --git a/YAMN/proto/pop3/pop3comm.h b/YAMN/proto/pop3/pop3comm.h
index 0d30e5d..7b93bda 100644
--- a/YAMN/proto/pop3/pop3comm.h
+++ b/YAMN/proto/pop3/pop3comm.h
@@ -4,11 +4,11 @@
#include <windows.h>
#include "pop3.h"
-#include "../../m_protoplugin.h"
+#include "m_protoplugin.h"
//We can use synchro.h because this is internal plugin. If you use external plugin,
//and you want to use SO for your plugin, you can use YAMN's SO.
//All you need is to include synchro.h and use YAMN's exported synchronization functions.
-#include "../../m_synchro.h"
+#include "m_synchro.h"
//For mail exported functions defintions
#include "../../mails/m_mails.h"
diff --git a/YAMN/yamn.h b/YAMN/yamn.h
index b209b24..fa42d5a 100644
--- a/YAMN/yamn.h
+++ b/YAMN/yamn.h
@@ -34,10 +34,10 @@
#include "m_protocols.h" //protocols
#include "m_protomod.h" //protocols module
#include "m_protosvc.h"
-#include "include/m_uninstaller.h" //PluginUninstaller structures
+#include "m_uninstaller.h" //PluginUninstaller structures
#include "m_toptoolbar.h"
#include "m_icolib.h"
-#include "include/m_kbdnotify.h"
+#include "m_kbdnotify.h"
#include "m_popup.h"
#include "m_updater.h"
#include "m_account.h" //Account structure and all needed structures to cooperate with YAMN