From e750e8644fb332c5cb9cc11a7a7cb6c2778e53e8 Mon Sep 17 00:00:00 2001 From: watcherhd Date: Tue, 29 Nov 2011 16:23:03 +0000 Subject: another part of small project fixes and x64 adaptation in some cases git-svn-id: http://miranda-plugins.googlecode.com/svn/trunk@229 e753b5eb-9565-29b2-b5c5-2cc6f99dfbcb --- IEView/Template.cpp | 6 +- IEView/TextToken.cpp | 2 +- IEView/ieview.sln | 14 +- IEView/ieview.vcxproj | 19 +- IgnoreState/ignore_10.vcxproj | 12 +- IgnoreState/ignore_9.vcproj | 8 +- LangMan/langman.sln | 25 ++ LangMan/langman.vcxproj | 80 ++---- MRA/Mra.vcxproj | 22 +- MenuItemEx/menuex_10.vcxproj | 2 - NewAwaySysMod/NewAwaySys.vcproj | 8 +- NewStatusNotify/NewStatusNotify_10.sln | 25 ++ NewStatusNotify/NewStatusNotify_10.vcxproj | 300 +++++++++++++++++++++ NewStatusNotify/NewStatusNotify_10.vcxproj.filters | 60 +++++ NewStatusNotify/NewStatusNotify_7.vcproj | 8 +- NewStatusNotify/NewStatusNotify_8.vcproj | 8 +- NewStatusNotify/NewStatusNotify_9.vcproj | 8 +- NewStatusNotify/main.c | 4 +- Nudge/main.cpp | 14 +- Nudge/nudge_10.suo | Bin 0 -> 9216 bytes Nudge/nudge_10.vcxproj | 47 ++-- PackUpdater/PackUpdater_10.vcxproj | 16 +- PackUpdater/PackUpdater_9.vcproj | 8 +- Popup/PopUp_10.vcxproj | 77 ++++-- Popup/PopUp_8.vcproj | 10 +- Popup/PopUp_9.vcproj | 20 +- imo2sproxy/msvc/imoproxy.vcxproj | 2 + mTextControl/mtextcontrol_10.vcxproj | 2 + mTextControl/mtextcontrol_9.vcproj | 8 +- 29 files changed, 609 insertions(+), 206 deletions(-) create mode 100644 LangMan/langman.sln create mode 100644 NewStatusNotify/NewStatusNotify_10.sln create mode 100644 NewStatusNotify/NewStatusNotify_10.vcxproj create mode 100644 NewStatusNotify/NewStatusNotify_10.vcxproj.filters create mode 100644 Nudge/nudge_10.suo diff --git a/IEView/Template.cpp b/IEView/Template.cpp index 9bc88e6..23e9a9c 100644 --- a/IEView/Template.cpp +++ b/IEView/Template.cpp @@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. TokenDef::TokenDef(const char *tokenString) { this->tokenString = tokenString; - this->tokenLen = strlen(tokenString); + this->tokenLen = (int)strlen(tokenString); this->token = 0; this->escape = 0; } @@ -31,7 +31,7 @@ TokenDef::TokenDef(const char *tokenString) { TokenDef::TokenDef(const char *tokenString, int token, int escape) { this->tokenString = tokenString; this->token = token; - this->tokenLen = strlen(tokenString); + this->tokenLen = (int)strlen(tokenString); this->escape = escape; } @@ -159,7 +159,7 @@ void Template::tokenize() { Token *lastToken = NULL; int lastTokenType = Token::PLAIN; int lastTokenEscape = 0; - int l = strlen(str); + int l = (int)strlen(str); for (int i=0, lastTokenStart=0; i<=l;) { Token *newToken; int newTokenType = 0, newTokenSize = 0, newTokenEscape = 0; diff --git a/IEView/TextToken.cpp b/IEView/TextToken.cpp index bfa2913..632a915 100644 --- a/IEView/TextToken.cpp +++ b/IEView/TextToken.cpp @@ -649,7 +649,7 @@ void TextToken::toString(wchar_t **str, int *sizeAlloced) { if (match != NULL) { match += 2; wchar_t *match2 = wcsstr(match, L"&"); - int len = match2 != NULL ? match2 - match : wcslen(match); + int len = match2 != NULL ? match2 - match : (int)wcslen(match); match = mir_wstrdup(match); match[len] = 0; int width ; diff --git a/IEView/ieview.sln b/IEView/ieview.sln index 6b1d1b8..0c87507 100644 --- a/IEView/ieview.sln +++ b/IEView/ieview.sln @@ -1,36 +1,24 @@  Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 +# Visual Studio 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ieview", "ieview.vcxproj", "{B988F96C-F87A-484C-AB15-D0674B22F291}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug Unicode|Win32 = Debug Unicode|Win32 Debug Unicode|x64 = Debug Unicode|x64 - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 Release Unicode|Win32 = Release Unicode|Win32 Release Unicode|x64 = Release Unicode|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {B988F96C-F87A-484C-AB15-D0674B22F291}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32 {B988F96C-F87A-484C-AB15-D0674B22F291}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32 {B988F96C-F87A-484C-AB15-D0674B22F291}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64 {B988F96C-F87A-484C-AB15-D0674B22F291}.Debug Unicode|x64.Build.0 = Debug Unicode|x64 - {B988F96C-F87A-484C-AB15-D0674B22F291}.Debug|Win32.ActiveCfg = Debug|Win32 - {B988F96C-F87A-484C-AB15-D0674B22F291}.Debug|Win32.Build.0 = Debug|Win32 - {B988F96C-F87A-484C-AB15-D0674B22F291}.Debug|x64.ActiveCfg = Debug|x64 - {B988F96C-F87A-484C-AB15-D0674B22F291}.Debug|x64.Build.0 = Debug|x64 {B988F96C-F87A-484C-AB15-D0674B22F291}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32 {B988F96C-F87A-484C-AB15-D0674B22F291}.Release Unicode|Win32.Build.0 = Release Unicode|Win32 {B988F96C-F87A-484C-AB15-D0674B22F291}.Release Unicode|x64.ActiveCfg = Release Unicode|x64 {B988F96C-F87A-484C-AB15-D0674B22F291}.Release Unicode|x64.Build.0 = Release Unicode|x64 - {B988F96C-F87A-484C-AB15-D0674B22F291}.Release|Win32.ActiveCfg = Release|Win32 - {B988F96C-F87A-484C-AB15-D0674B22F291}.Release|Win32.Build.0 = Release|Win32 - {B988F96C-F87A-484C-AB15-D0674B22F291}.Release|x64.ActiveCfg = Release|x64 - {B988F96C-F87A-484C-AB15-D0674B22F291}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/IEView/ieview.vcxproj b/IEView/ieview.vcxproj index 2debb0a..6e45c8a 100644 --- a/IEView/ieview.vcxproj +++ b/IEView/ieview.vcxproj @@ -58,16 +58,15 @@ <_ProjectFileVersion>10.0.30319.1 $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)/Plugins\ + $(SolutionDir)\$(Configuration) $(Platform)/Plugins\ $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ - $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)/Obj/$(ProjectName)\ true true $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)/Plugins\ + $(SolutionDir)\$(Configuration) $(Platform)/Plugins\ $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ - $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ - true + $(SolutionDir)\$(Configuration) $(Platform)/Obj/$(ProjectName)\ @@ -88,6 +87,7 @@ true Windows MachineX86 + $(IntDir)$(TargetName).lib @@ -107,13 +107,14 @@ comctl32.lib;%(AdditionalDependencies) true Windows + $(IntDir)$(TargetName).lib Full Size - false + true ../include;../ExternalAPI;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;IEVIEW_EXPORTS;%(PreprocessorDefinitions) @@ -130,13 +131,15 @@ true true MachineX86 + UseLinkTimeCodeGeneration + $(IntDir)$(TargetName).lib Full Size - false + true ../include;../ExternalAPI;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;IEVIEW_EXPORTS;%(PreprocessorDefinitions) MultiThreaded @@ -152,6 +155,8 @@ Windows true true + UseLinkTimeCodeGeneration + $(IntDir)$(TargetName).lib diff --git a/IgnoreState/ignore_10.vcxproj b/IgnoreState/ignore_10.vcxproj index 8508d07..231acb0 100644 --- a/IgnoreState/ignore_10.vcxproj +++ b/IgnoreState/ignore_10.vcxproj @@ -66,13 +66,13 @@ <_ProjectFileVersion>10.0.30319.1 $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)64/Plugins\ + $(SolutionDir)\$(Configuration) $(Platform)/Plugins\ $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ - $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)/Obj/$(ProjectName)\ $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)64/Plugins\ + $(SolutionDir)\$(Configuration) $(Platform)/Plugins\ $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ - $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)/Obj/$(ProjectName)\ AllRules.ruleset AllRules.ruleset @@ -112,7 +112,7 @@ Disabled - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;AUTHSTATE_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDebug Level3 @@ -166,7 +166,7 @@ Full OnlyExplicitInline Size - ../../include;../ExternalAPI + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;AUTHSTATE_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) Level3 ProgramDatabase diff --git a/IgnoreState/ignore_9.vcproj b/IgnoreState/ignore_9.vcproj index c4202ec..701906a 100644 --- a/IgnoreState/ignore_9.vcproj +++ b/IgnoreState/ignore_9.vcproj @@ -45,7 +45,7 @@ <_ProjectFileVersion>10.0.30319.1 - .\temp/Debug/Unicode\ - .\temp/Debug/Unicode\ + $(SolutionDir)$(Configuration)/Plugins\ + $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ true true - .\temp/Debug/ANSI\ - .\temp/Debug/ANSI\ + $(SolutionDir)$(Configuration)/Plugins\ + $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ true true - .\temp/Release/ANSI\ - .\temp/Release/ANSI\ + $(SolutionDir)$(Configuration)/Plugins\ + $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ true false - $(SolutionDir)\..\..\Install\Files\Plugins\ - $(SolutionDir)Obj\$(ProjectName)\ + $(SolutionDir)$(Configuration)/Plugins\ + $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ true false $(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(SolutionDir)\..\SVN\Miranda\Trunk\miranda\include @@ -97,15 +97,11 @@ Disabled - .\include;%(AdditionalIncludeDirectories) + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) _DEBUG;UNICODE;WIN32;_WINDOWS;_USRDLL;STRICT;LANGMAN_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug - .\temp/Debug/Unicode/langman.pch - .\temp/Debug/Unicode/ - .\temp/Debug/Unicode/ - .\temp/Debug/Unicode/ true Level4 true @@ -120,24 +116,20 @@ /mapinfo:lines %(AdditionalOptions) comctl32.lib;%(AdditionalDependencies) - D:\Miranda IM\Unicode\Plugins\langman.dll true uuid.lib;OLDNAMES;%(IgnoreSpecificDefaultLibraries) langman.def true - D:\Miranda IM\Unicode\Plugins\langman.pdb true - .\temp/Debug/Unicode/langman.map 0x24100000 false - .\temp/Debug/Unicode/langman.lib + $(IntDir)$(TargetName).lib MachineX86 true - .\temp/Debug/Unicode/langman.bsc @@ -152,15 +144,11 @@ Disabled - .\include;%(AdditionalIncludeDirectories) + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) _DEBUG;WIN32;_WINDOWS;_USRDLL;STRICT;LANGMAN_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug - .\temp/Debug/ANSI/langman.pch - .\temp/Debug/ANSI/ - .\temp/Debug/ANSI/ - .\temp/Debug/ANSI/ true Level4 true @@ -175,24 +163,20 @@ /mapinfo:lines %(AdditionalOptions) comctl32.lib;%(AdditionalDependencies) - D:\Miranda IM\ANSI\Plugins\langman.dll true uuid.lib;OLDNAMES;%(IgnoreSpecificDefaultLibraries) langman.def true - D:\Miranda IM\ANSI\Plugins\langman.pdb true - .\temp/Debug/ANSI/langman.map 0x24100000 false - .\temp/Debug/ANSI/langman.lib + $(IntDir)$(TargetName).lib MachineX86 true - .\temp/Debug/ANSI/langman.bsc @@ -206,21 +190,19 @@ /opt:nowin98 %(AdditionalOptions) - MaxSpeed + Full OnlyExplicitInline - .\include;%(AdditionalIncludeDirectories) + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) NDEBUG;WIN32;_WINDOWS;_USRDLL;STRICT;LANGMAN_EXPORTS;%(PreprocessorDefinitions) true - MultiThreadedDLL + MultiThreaded true - .\temp/Release/ANSI/langman.pch - .\temp/Release/ANSI/ - .\temp/Release/ANSI/ - .\temp/Release/ANSI/ true Level4 true NO_STRICT;%(UndefinePreprocessorDefinitions) + Size + true NDEBUG;%(PreprocessorDefinitions) @@ -230,25 +212,24 @@ /mapinfo:lines /ignore:4078 %(AdditionalOptions) comctl32.lib;%(AdditionalDependencies) - .\release\ANSI\langman.dll true uuid.lib;OLDNAMES;%(IgnoreSpecificDefaultLibraries) langman.def true - .\release\ANSI\langman.pdb true - .\release\ANSI\langman.map true 0x24100000 false - .\temp/Release/ANSI/langman.lib + $(IntDir)$(TargetName).lib MachineX86 + true + true + UseLinkTimeCodeGeneration true - .\temp/Release/ANSI/langman.bsc @@ -261,23 +242,16 @@ - MinSpace - Disabled - false + Full + OnlyExplicitInline Size - false - false true - .\include;%(AdditionalIncludeDirectories) + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) NDEBUG;UNICODE;WIN32;_WINDOWS;_USRDLL;STRICT;LANGMAN_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true - MultiThreadedDLL + MultiThreaded false NotSet - $(IntDir)langman.pch - $(IntDir) - $(IntDir) - $(IntDir) $(IntDir) false Level3 @@ -298,14 +272,11 @@ comctl32.lib;%(AdditionalDependencies) - $(OutDir)$(TargetName)$(TargetExt) true uuid.lib;OLDNAMES;%(IgnoreSpecificDefaultLibraries) langman.def true - $(IntDir)$(TargetName).pdb false - $(IntDir)langman.map true 0x24100000 true @@ -319,7 +290,6 @@ true - $(IntDir)$(TargetName).bsc $(IntDir)$(TargetName).xml diff --git a/MRA/Mra.vcxproj b/MRA/Mra.vcxproj index 62f5102..75dc1c5 100644 --- a/MRA/Mra.vcxproj +++ b/MRA/Mra.vcxproj @@ -116,7 +116,7 @@ Level3 EditAndContinue - ./sdk;../../include;../ExternalAPI + ./sdk;../include;../ExternalAPI;%(AdditionalIncludeDirectories) Crypt32.lib;shlwapi.lib;Ws2_32.lib;mswsock.lib;%(AdditionalDependencies) @@ -161,6 +161,7 @@ Level3 ProgramDatabase CompileAsCpp + ./sdk;../include;../ExternalAPI;%(AdditionalIncludeDirectories) shlwapi.lib;Ws2_32.lib;mswsock.lib;%(AdditionalDependencies) @@ -179,7 +180,7 @@ false false true - $(OutDir)Mra.lib + $(IntDir)$(TargetName).lib MachineX64 @@ -195,8 +196,6 @@ OnlyExplicitInline false Size - true - false WIN32;NDEBUG;_WINDOWS;_USRDLL;MRA_EXPORTS;%(PreprocessorDefinitions) true @@ -209,7 +208,8 @@ Level3 ProgramDatabase - ./sdk;../include;../ExternalAPI + ./sdk;../include;../ExternalAPI;%(AdditionalIncludeDirectories) + true @@ -225,7 +225,6 @@ true true - Default $(IntDir)$(TargetName).lib @@ -245,12 +244,10 @@ X64 - MinSpace + Full OnlyExplicitInline false Size - true - false WIN64;NDEBUG;_WINDOWS;_USRDLL;MRA_EXPORTS;%(PreprocessorDefinitions) true @@ -264,7 +261,8 @@ Level3 - ./sdk;../include;../ExternalAPI + ./sdk;../include;../ExternalAPI;%(AdditionalIncludeDirectories) + true false @@ -284,8 +282,6 @@ Windows true true - - true @@ -293,7 +289,7 @@ true false true - $(OutDir)Mra.lib + $(IntDir)$(TargetName).lib MachineX64 DefaultThreadingAttribute Default diff --git a/MenuItemEx/menuex_10.vcxproj b/MenuItemEx/menuex_10.vcxproj index b0dae91..95f3ead 100644 --- a/MenuItemEx/menuex_10.vcxproj +++ b/MenuItemEx/menuex_10.vcxproj @@ -401,7 +401,6 @@ msimg32.lib;%(AdditionalDependencies) - $(OutDir)Plugins\$(ProjectName).dll true true true @@ -494,7 +493,6 @@ /filealign:0x200 %(AdditionalOptions) msimg32.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).dll type=%27Win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27X86%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies) true true diff --git a/NewAwaySysMod/NewAwaySys.vcproj b/NewAwaySysMod/NewAwaySys.vcproj index 1a58ed3..112caa1 100644 --- a/NewAwaySysMod/NewAwaySys.vcproj +++ b/NewAwaySysMod/NewAwaySys.vcproj @@ -22,7 +22,7 @@ + + + + Debug Unicode + Win32 + + + Debug + Win32 + + + Release Unicode + Win32 + + + Release + Win32 + + + + NewStatusNotify + {78E0E6B0-2D7E-4B4D-899A-DA244FBBEC73} + NewStatusNotify + + + + DynamicLibrary + false + MultiByte + + + DynamicLibrary + false + MultiByte + + + DynamicLibrary + false + Unicode + false + + + DynamicLibrary + false + Unicode + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(Configuration)/Plugins\ + $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ + $(SolutionDir)$(Configuration)/Plugins\ + $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ + $(SolutionDir)$(Configuration)/Plugins\ + $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ + $(SolutionDir)$(Configuration)/Plugins\ + $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ + true + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Release/NewStatusNotify.tlb + + + + + Full + OnlyExplicitInline + Size + true + false + true + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) + true + + + MultiThreaded + true + + + + + Level3 + CompileAsC + + + NDEBUG;%(PreprocessorDefinitions) + 0x0000 + + + /release %(AdditionalOptions) + comctl32.lib;winmm.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName).dll + true + %(AdditionalLibraryDirectories) + + + true + true + true + UseLinkTimeCodeGeneration + + + $(IntDir)$(TargetName).lib + MachineX86 + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Release/NewStatusNotify.tlb + + + + + Disabled + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + true + + + newstatusnotify.h + + + + + Level3 + EditAndContinue + CompileAsC + + + _DEBUG;%(PreprocessorDefinitions) + 0x0000 + + + comctl32.lib;winmm.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName).dll + + + %(AdditionalLibraryDirectories) + true + + + + + $(IntDir)$(TargetName).lib + MachineX86 + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Release/NewStatusNotify.tlb + + + + + Disabled + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + + + + + $(OutDir) + Level3 + EditAndContinue + CompileAsC + + + _DEBUG;%(PreprocessorDefinitions) + 0x0000 + + + comctl32.lib;winmm.lib;%(AdditionalDependencies) + $(OutDir)$(ProjectName).dll + 1.1.2.5 + true + %(AdditionalLibraryDirectories) + true + $(OutDir)$(ProjectName).map + + + $(IntDir)$(TargetName).lib + MachineX86 + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Release/NewStatusNotify.tlb + + + + + Full + OnlyExplicitInline + Size + true + true + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) + true + MultiThreaded + true + + + + + Level3 + CompileAsC + + + NDEBUG;%(PreprocessorDefinitions) + 0x0000 + + + /release %(AdditionalOptions) + comctl32.lib;winmm.lib;%(AdditionalDependencies) + NotSet + $(OutDir)$(ProjectName).dll + true + %(AdditionalLibraryDirectories) + + + true + true + true + UseLinkTimeCodeGeneration + + + $(IntDir)$(TargetName).lib + MachineX86 + + + + + + $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.obj + $(IntDir)%(Filename)1.obj + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/NewStatusNotify/NewStatusNotify_10.vcxproj.filters b/NewStatusNotify/NewStatusNotify_10.vcxproj.filters new file mode 100644 index 0000000..43b2131 --- /dev/null +++ b/NewStatusNotify/NewStatusNotify_10.vcxproj.filters @@ -0,0 +1,60 @@ + + + + + {6537d2b7-049a-4673-8eec-d5e35e5a33e3} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + + + {910d9c58-9eb3-4838-b11f-3f652824226d} + h;hpp;hxx;hm;inl + + + {7c28ea1e-73b6-468b-bc87-cea7bec69bdd} + ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe + + + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + + + + + Resource Files + + + \ No newline at end of file diff --git a/NewStatusNotify/NewStatusNotify_7.vcproj b/NewStatusNotify/NewStatusNotify_7.vcproj index c9447b2..a4ebf19 100644 --- a/NewStatusNotify/NewStatusNotify_7.vcproj +++ b/NewStatusNotify/NewStatusNotify_7.vcproj @@ -26,7 +26,7 @@ OmitFramePointers="TRUE" EnableFiberSafeOptimizations="FALSE" WholeProgramOptimization="TRUE" - AdditionalIncludeDirectories="..\..\include;..\ExternalAPI" + AdditionalIncludeDirectories="../include;../ExternalAPI" StringPooling="TRUE" ExceptionHandling="FALSE" RuntimeLibrary="0" @@ -98,7 +98,7 @@ Name="VCCLCompilerTool" Optimization="0" WholeProgramOptimization="FALSE" - AdditionalIncludeDirectories="..\..\include\" + AdditionalIncludeDirectories="../include;../ExternalAPI" PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;NewStatusNotify_EXPORTS" BasicRuntimeChecks="3" RuntimeLibrary="1" @@ -165,7 +165,7 @@ newStatus = (WORD)(i <= ID_STATUS_MAX ? (pd->oldStatus + 1) : ID_STATUS_ONLINE); pd->newStatus = (WORD)(i < ID_STATUS_MAX ? (i + 1) : (i == ID_STATUS_MAX ? ID_STATUS_OFFLINE : ID_STATUS_ONLINE)); ppd.lchIcon = LoadSkinnedIcon(StatusesList[Index(pd->newStatus)].Icon); - lstrcpyn(ppd.lptzContactName, (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)NULL,GCMDF_TCHAR), SIZEOF(ppd.lptzContactName)-1); + lstrcpyn(ppd.lptzContactName, (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)NULL,GSMDF_TCHAR), SIZEOF(ppd.lptzContactName)-1); if (MyOptions.UseDullText == 1) lstrcpy(ppd.lptzText, StatusesList[Index(pd->newStatus)].lpzStandardText); else if (MyOptions.UseDullText == 2) diff --git a/Nudge/main.cpp b/Nudge/main.cpp index 0e5fc3f..28c10c4 100644 --- a/Nudge/main.cpp +++ b/Nudge/main.cpp @@ -104,7 +104,7 @@ void RegisterToUpdate(void) update.szComponentName = pluginInfo.shortName; update.pbVersion = (BYTE *)CreateVersionStringPluginEx(&pluginInfo, szVersion); - update.cpbVersion = strlen((char *)update.pbVersion); + update.cpbVersion = (int)strlen((char *)update.pbVersion); update.szUpdateURL = UPDATER_AUTOREGISTER; update.szVersionURL = "http://addons.miranda-im.org/details.php?action=viewfile&id=2708"; update.pbVersionPrefix = (BYTE *)"Nudge "; @@ -112,8 +112,8 @@ void RegisterToUpdate(void) update.szBetaVersionURL = "http://www.miranda-fr.net/tweety/Nudge/Nudge_beta.html"; update.pbBetaVersionPrefix = (BYTE *)"Nudge version "; - update.cpbVersionPrefix = strlen((char *)update.pbVersionPrefix); - update.cpbBetaVersionPrefix = strlen((char *)update.pbBetaVersionPrefix); + update.cpbVersionPrefix = (int)strlen((char *)update.pbVersionPrefix); + update.cpbBetaVersionPrefix = (int)strlen((char *)update.pbBetaVersionPrefix); CallService(MS_UPDATE_REGISTER, 0, (WPARAM)&update); @@ -832,7 +832,7 @@ void Nudge_SentEvent(CNudgeElement n, HANDLE hCont) char buff[TEXT_LEN]; WideCharToMultiByte(code_page, 0, n.senText, -1, buff, TEXT_LEN, 0, 0); buff[TEXT_LEN] = 0; - NudgeEvent.cbBlob = strlen(buff) + 1; + NudgeEvent.cbBlob = (DWORD)strlen(buff) + 1; NudgeEvent.pBlob = ( PBYTE ) buff; #else NudgeEvent.cbBlob = _tcsclen(n.senText) + 1; @@ -865,7 +865,7 @@ void Nudge_SentStatus(CNudgeElement n, HANDLE hCont) char buff[TEXT_LEN]; WideCharToMultiByte(code_page, 0, n.senText, -1, buff, TEXT_LEN, 0, 0); buff[TEXT_LEN] = 0; - NudgeEvent.cbBlob = strlen(buff) + 1; + NudgeEvent.cbBlob = (DWORD)strlen(buff) + 1; NudgeEvent.pBlob = ( PBYTE ) buff; #else NudgeEvent.cbBlob = _tcsclen(n.senText) + 1; @@ -898,7 +898,7 @@ void Nudge_ShowStatus(CNudgeElement n, HANDLE hCont, DWORD timestamp) char buff[TEXT_LEN]; WideCharToMultiByte(code_page, 0, n.recText, -1, buff, TEXT_LEN, 0, 0); buff[TEXT_LEN] = 0; - NudgeEvent.cbBlob = strlen(buff) + 1; + NudgeEvent.cbBlob = (DWORD)strlen(buff) + 1; NudgeEvent.pBlob = ( PBYTE ) buff; #else NudgeEvent.cbBlob = _tcsclen(n.recText) + 1; @@ -934,7 +934,7 @@ void Nudge_ShowEvent(CNudgeElement n, HANDLE hCont, DWORD timestamp) char buff[TEXT_LEN]; WideCharToMultiByte(code_page, 0, n.recText, -1, buff, TEXT_LEN, 0, 0); buff[TEXT_LEN] = 0; - NudgeEvent.cbBlob = strlen(buff) + 1; + NudgeEvent.cbBlob = (DWORD)strlen(buff) + 1; NudgeEvent.pBlob = ( PBYTE ) buff; #else NudgeEvent.cbBlob = _tcsclen(n.recText) + 1; diff --git a/Nudge/nudge_10.suo b/Nudge/nudge_10.suo new file mode 100644 index 0000000..1b57fcb Binary files /dev/null and b/Nudge/nudge_10.suo differ diff --git a/Nudge/nudge_10.vcxproj b/Nudge/nudge_10.vcxproj index 32e6e5f..2c951c7 100644 --- a/Nudge/nudge_10.vcxproj +++ b/Nudge/nudge_10.vcxproj @@ -93,21 +93,19 @@ <_ProjectFileVersion>10.0.30319.1 $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)64/Plugins\ + $(SolutionDir)\$(Configuration) $(Platform)/Plugins\ $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ - $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)/Obj/$(ProjectName)\ $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)64/Plugins\ + $(SolutionDir)\$(Configuration) $(Platform)/Plugins\ $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ - $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ - true - true - true - true + $(SolutionDir)\$(Configuration) $(Platform)/Obj/$(ProjectName)\ $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ $(SolutionDir)$(Configuration)/Plugins\ + $(SolutionDir)\$(Configuration) $(Platform)/Plugins\ + $(SolutionDir)\$(Configuration) $(Platform)/Obj/$(ProjectName)\ @@ -121,10 +119,10 @@ Disabled - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;nudge_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks - MultiThreadedDebugDLL + MultiThreadedDebug true @@ -142,7 +140,7 @@ true true .\Debug/nudge.pdb - .\Debug/nudge.lib + $(IntDir)$(TargetName).lib MachineX86 @@ -157,10 +155,10 @@ Disabled - ../../../include;%(AdditionalIncludeDirectories) + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;nudge_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks - MultiThreadedDebugDLL + MultiThreadedDebug true @@ -178,7 +176,7 @@ true true .\Debug/nudge.pdb - .\Debug/nudge.lib + $(IntDir)$(TargetName).lib @@ -196,7 +194,7 @@ OnlyExplicitInline Size false - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;_UNICODE;UNICODE;MICROSOFT_LAYER_FOR_UNICODE=1;%(PreprocessorDefinitions) true MultiThreaded @@ -209,6 +207,7 @@ ProgramDatabase Default 4996;%(DisableSpecificWarnings) + true NDEBUG;%(PreprocessorDefinitions) @@ -225,6 +224,8 @@ true true MachineX86 + UseLinkTimeCodeGeneration + $(IntDir)$(TargetName).lib @@ -241,7 +242,7 @@ OnlyExplicitInline Size false - ../../../include;%(AdditionalIncludeDirectories) + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;_UNICODE;UNICODE;MICROSOFT_LAYER_FOR_UNICODE=1;%(PreprocessorDefinitions) true MultiThreaded @@ -254,6 +255,7 @@ ProgramDatabase Default 4996;%(DisableSpecificWarnings) + true NDEBUG;%(PreprocessorDefinitions) @@ -261,7 +263,6 @@ unicows.lib;comctl32.lib;Delayimp.lib;gdiplus.lib;version.lib;%(AdditionalDependencies) - $(SolutionDir)Release/Plugins/nudge.dll true false %(DelayLoadDLLs) @@ -270,6 +271,8 @@ true true + UseLinkTimeCodeGeneration + $(IntDir)$(TargetName).lib @@ -287,7 +290,7 @@ OnlyExplicitInline Size false - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;_UNICODE;UNICODE;MICROSOFT_LAYER_FOR_UNICODE=1;%(PreprocessorDefinitions) true MultiThreaded @@ -300,6 +303,7 @@ ProgramDatabase Default 4996;%(DisableSpecificWarnings) + true NDEBUG;%(PreprocessorDefinitions) @@ -316,6 +320,8 @@ true true MachineX86 + UseLinkTimeCodeGeneration + $(IntDir)$(TargetName).lib @@ -332,7 +338,7 @@ OnlyExplicitInline Size false - ../../../include;%(AdditionalIncludeDirectories) + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) _WIN64;_DEBUG;_WINDOWS;_USRDLL;_UNICODE;UNICODE;MICROSOFT_LAYER_FOR_UNICODE=1;%(PreprocessorDefinitions) true MultiThreaded @@ -345,6 +351,7 @@ ProgramDatabase Default 4996;%(DisableSpecificWarnings) + true NDEBUG;%(PreprocessorDefinitions) @@ -360,6 +367,8 @@ true true + UseLinkTimeCodeGeneration + $(IntDir)$(TargetName).lib diff --git a/PackUpdater/PackUpdater_10.vcxproj b/PackUpdater/PackUpdater_10.vcxproj index 29a362c..cd1fc15 100644 --- a/PackUpdater/PackUpdater_10.vcxproj +++ b/PackUpdater/PackUpdater_10.vcxproj @@ -62,13 +62,13 @@ <_ProjectFileVersion>10.0.30319.1 $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)64/Plugins\ + $(SolutionDir)\$(Configuration) $(Platform)/Plugins\ $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ - $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)/Obj/$(ProjectName)\ $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)64/Plugins\ + $(SolutionDir)\$(Configuration) $(Platform)/Plugins\ $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ - $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)/Obj/$(ProjectName)\ AllRules.ruleset AllRules.ruleset @@ -85,7 +85,7 @@ Disabled - ../../include;../ExternalAPI + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;PACKUPDATER_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDebug Level3 @@ -114,7 +114,7 @@ Disabled - ../../include;../ExternalAPI + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;PACKUPDATER_EXPORTS;%(PreprocessorDefinitions) MultiThreadedDebug Level3 @@ -141,7 +141,7 @@ Full Size - ../../include;../ExternalAPI + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;PACKUPDATER_EXPORTS;%(PreprocessorDefinitions) Level3 ProgramDatabase @@ -172,7 +172,7 @@ Full Size - ../../include;../ExternalAPI + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;PACKUPDATER_EXPORTS;%(PreprocessorDefinitions) Level3 ProgramDatabase diff --git a/PackUpdater/PackUpdater_9.vcproj b/PackUpdater/PackUpdater_9.vcproj index 06dce5c..1affd17 100644 --- a/PackUpdater/PackUpdater_9.vcproj +++ b/PackUpdater/PackUpdater_9.vcproj @@ -44,7 +44,7 @@ $(SolutionDir)$(Configuration)/Plugins\ $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ true - $(SolutionDir)$(Configuration)64/Plugins\ - $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)/Plugins\ + $(SolutionDir)\$(Configuration) $(Platform)/Obj/$(ProjectName)\ *.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).* true false $(SolutionDir)$(Configuration)/Plugins\ $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ true - $(SolutionDir)$(Configuration)64/Plugins\ - $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)/Plugins\ + $(SolutionDir)\$(Configuration) $(Platform)/Obj/$(ProjectName)\ *.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).* true true $(SolutionDir)$(Configuration)/Plugins\ $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ true - $(SolutionDir)$(Configuration)64/Plugins\ - $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)/Plugins\ + $(SolutionDir)\$(Configuration) $(Platform)/Obj/$(ProjectName)\ *.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).* true true $(SolutionDir)$(Configuration)/Plugins\ $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ true - $(SolutionDir)$(Configuration)64/Plugins\ - $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ + $(SolutionDir)\$(Configuration) $(Platform)/Plugins\ + $(SolutionDir)\$(Configuration) $(Platform)/Obj/$(ProjectName)\ *.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).* true false @@ -169,8 +169,10 @@ $(ProjectName)W $(ProjectName)W - $(ProjectName)W - $(ProjectName)W + $(ProjectName) + $(ProjectName) + $(ProjectName)W + $(ProjectName)W @@ -182,9 +184,9 @@ - MaxSpeed + Full OnlyExplicitInline - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;POPUP_EXPORTS;MTEXT_NOHELPERS;%(PreprocessorDefinitions) true MultiThreaded @@ -193,6 +195,8 @@ headers.h Level3 ProgramDatabase + Size + true NDEBUG;%(PreprocessorDefinitions) @@ -207,13 +211,16 @@ $(IntDir)$(TargetName).lib MachineX86 + true + true + UseLinkTimeCodeGeneration - MaxSpeed + Full OnlyExplicitInline - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;POPUP_EXPORTS;MTEXT_NOHELPERS;%(PreprocessorDefinitions) true MultiThreaded @@ -226,6 +233,8 @@ Level3 true ProgramDatabase + Size + true NDEBUG;%(PreprocessorDefinitions) @@ -243,12 +252,15 @@ $(IntDir)$(TargetName).lib MachineX64 + true + true + UseLinkTimeCodeGeneration Disabled - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;POPUP_EXPORTS;MTEXT_NOHELPERS;%(PreprocessorDefinitions) MultiThreadedDebug Use @@ -268,14 +280,15 @@ $(IntDir)$(TargetName).lib MachineX86 + $(OutDir)$(TargetName)$(TargetExt) Disabled - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;POPUP_EXPORTS;MTEXT_NOHELPERS;%(PreprocessorDefinitions) - MultiThreadedDebugDLL + MultiThreadedDebug Use headers.h $(IntDir) @@ -292,7 +305,7 @@ msimg32.lib;gdiplus.lib;comctl32.lib;%(AdditionalDependencies) - $(OutDir)$(RootNamespace).dll + $(OutDir)$(TargetName)$(TargetExt) true true $(TargetDir)$(TargetName).map @@ -307,7 +320,7 @@ Disabled - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;POPUP_EXPORTS;MTEXT_NOHELPERS;_UNICODE;UNICODE;%(PreprocessorDefinitions) MultiThreadedDebug Use @@ -329,14 +342,15 @@ $(IntDir)$(TargetName).lib MachineX86 + $(OutDir)$(TargetName)$(TargetExt) Disabled - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;POPUP_EXPORTS;MTEXT_NOHELPERS;_UNICODE;UNICODE;%(PreprocessorDefinitions) - MultiThreadedDebugDLL + MultiThreadedDebug Use headers.h $(IntDir) @@ -354,7 +368,7 @@ msimg32.lib;gdiplus.lib;comctl32.lib;%(AdditionalDependencies) - $(OutDir)$(RootNamespace)W.dll + $(OutDir)$(TargetName)$(TargetExt) true true $(TargetDir)$(TargetName).map @@ -370,7 +384,7 @@ Full OnlyExplicitInline - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;POPUP_EXPORTS;MTEXT_NOHELPERS;_UNICODE;UNICODE;%(PreprocessorDefinitions) true MultiThreaded @@ -380,6 +394,7 @@ Level3 ProgramDatabase Size + true NDEBUG;_UNICODE;UNICODE;%(PreprocessorDefinitions) @@ -394,6 +409,9 @@ $(IntDir)$(TargetName).lib MachineX86 + true + true + UseLinkTimeCodeGeneration @@ -406,14 +424,14 @@ - MaxSpeed + Full OnlyExplicitInline - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + ../include;../ExternalAPI;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;POPUP_EXPORTS;MTEXT_NOHELPERS;_UNICODE;UNICODE;%(PreprocessorDefinitions) true - MultiThreadedDLL + MultiThreaded true - Use + NotUsing headers.h $(IntDir) $(IntDir) @@ -421,6 +439,8 @@ Level3 true ProgramDatabase + Size + true NDEBUG;_UNICODE;UNICODE;%(PreprocessorDefinitions) @@ -438,6 +458,9 @@ $(IntDir)$(TargetName).lib MachineX64 + true + true + UseLinkTimeCodeGeneration diff --git a/Popup/PopUp_8.vcproj b/Popup/PopUp_8.vcproj index efe3af5..3207c51 100644 --- a/Popup/PopUp_8.vcproj +++ b/Popup/PopUp_8.vcproj @@ -49,7 +49,7 @@ Name="VCCLCompilerTool" Optimization="2" InlineFunctionExpansion="1" - AdditionalIncludeDirectories="../../include;../ExternalAPI" + AdditionalIncludeDirectories="../include;../ExternalAPI" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;POPUP_EXPORTS" StringPooling="true" RuntimeLibrary="0" @@ -140,7 +140,7 @@ WIN32;NDEBUG;_WINDOWS;_USRDLL;imoproxy_EXPORTS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) true Size + true true @@ -121,6 +122,7 @@ odbc32.lib;odbccp32.lib;%(AdditionalDependencies) true true + UseLinkTimeCodeGeneration diff --git a/mTextControl/mtextcontrol_10.vcxproj b/mTextControl/mtextcontrol_10.vcxproj index 2e4f7bb..fac3a81 100644 --- a/mTextControl/mtextcontrol_10.vcxproj +++ b/mTextControl/mtextcontrol_10.vcxproj @@ -159,6 +159,7 @@ Size + true NDEBUG;_UNICODE;UNICODE;%(PreprocessorDefinitions) @@ -175,6 +176,7 @@ true true + UseLinkTimeCodeGeneration diff --git a/mTextControl/mtextcontrol_9.vcproj b/mTextControl/mtextcontrol_9.vcproj index b58a018..1ad020d 100644 --- a/mTextControl/mtextcontrol_9.vcproj +++ b/mTextControl/mtextcontrol_9.vcproj @@ -51,7 +51,7 @@