From b79d157ac729f61af715266b91a78eb8e0969d19 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sun, 27 May 2012 13:30:38 +0000 Subject: projects cleanup git-svn-id: http://svn.miranda-ng.org/main/trunk@196 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- bin10/mir_full.sln | 23 +- plugins/HistoryLinkListPlus/linklist.vcxproj | 128 +++-------- plugins/JSON/libjson.vcxproj | 97 +++++++-- plugins/KeyboardNotify/KeyboardNotify_10.vcxproj | 157 ++++++-------- plugins/LangMan/langman.vcxproj | 215 +++++++++--------- plugins/ListeningTo/listeningto.vcxproj | 241 ++++++++++----------- .../AdvancedAutoAway/AdvancedAutoAway_10.vcxproj | 19 +- .../StatusPlugins/KeepStatus/KeepStatus_10.vcxproj | 158 ++++++-------- protocols/IRCG/IRC_10.vcxproj | 142 ++---------- protocols/JabberG/jabber_10.vcxproj | 124 +++-------- 10 files changed, 530 insertions(+), 774 deletions(-) diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln index e4cea39fd4..60a25264d6 100644 --- a/bin10/mir_full.sln +++ b/bin10/mir_full.sln @@ -272,7 +272,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Omegle", "..\protocols\Omeg EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Omegle", "..\protocols\Omegle\omegle_icons_10.vcxproj", "{C5AB34D2-15F5-4CBA-8F42-DB48A4E52910}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libJSON", "..\plugins\JSON\libjson.vcxproj", "{F6B2FB04-4FFD-419F-BC9F-8CC43F00C2B0}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibJSON", "..\plugins\JSON\libjson.vcxproj", "{F6B2FB04-4FFD-419F-BC9F-8CC43F00C2B0}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Svc_vi", "..\plugins\Svc_vi\VersionInfo_10.vcxproj", "{3CE5572B-B7B0-4D1C-9D10-4622FBA6198E}" EndProject @@ -1071,11 +1071,14 @@ Global {5F09C93B-463A-4BF5-A85E-6E4E916AA8F8}.Release|x64.Build.0 = Release|x64 {F2ABCBFB-FEB8-49DF-B166-C2FA5148ACE1}.Debug|Win32.ActiveCfg = Debug|Win32 {F2ABCBFB-FEB8-49DF-B166-C2FA5148ACE1}.Debug|Win32.Build.0 = Debug|Win32 - {F2ABCBFB-FEB8-49DF-B166-C2FA5148ACE1}.Debug|x64.ActiveCfg = Debug|Win32 + {F2ABCBFB-FEB8-49DF-B166-C2FA5148ACE1}.Debug|x64.ActiveCfg = Debug|x64 + {F2ABCBFB-FEB8-49DF-B166-C2FA5148ACE1}.Debug|x64.Build.0 = Debug|x64 {F2ABCBFB-FEB8-49DF-B166-C2FA5148ACE1}.Release|Win32.ActiveCfg = Release|Win32 {F2ABCBFB-FEB8-49DF-B166-C2FA5148ACE1}.Release|Win32.Build.0 = Release|Win32 - {F2ABCBFB-FEB8-49DF-B166-C2FA5148ACE1}.Release|x64.ActiveCfg = Release|Win32 + {F2ABCBFB-FEB8-49DF-B166-C2FA5148ACE1}.Release|x64.ActiveCfg = Release|x64 + {F2ABCBFB-FEB8-49DF-B166-C2FA5148ACE1}.Release|x64.Build.0 = Release|x64 {C619A811-8023-4441-B3D7-785388A09DF0}.Debug|Win32.ActiveCfg = Debug|Win32 + {C619A811-8023-4441-B3D7-785388A09DF0}.Debug|Win32.Build.0 = Debug|Win32 {C619A811-8023-4441-B3D7-785388A09DF0}.Debug|x64.ActiveCfg = Debug|x64 {C619A811-8023-4441-B3D7-785388A09DF0}.Debug|x64.Build.0 = Debug|x64 {C619A811-8023-4441-B3D7-785388A09DF0}.Release|Win32.ActiveCfg = Release|Win32 @@ -1097,6 +1100,7 @@ Global {A9265E36-7F2D-440C-BF3E-F447FDB6200F}.Release|Win32.ActiveCfg = Release|Win32 {A9265E36-7F2D-440C-BF3E-F447FDB6200F}.Release|Win32.Build.0 = Release|Win32 {A9265E36-7F2D-440C-BF3E-F447FDB6200F}.Release|x64.ActiveCfg = Release|x64 + {A9265E36-7F2D-440C-BF3E-F447FDB6200F}.Release|x64.Build.0 = Release|x64 {065889B7-478C-8E11-E93B-54A6D5A21564}.Debug|Win32.ActiveCfg = Debug|Win32 {065889B7-478C-8E11-E93B-54A6D5A21564}.Debug|Win32.Build.0 = Debug|Win32 {065889B7-478C-8E11-E93B-54A6D5A21564}.Debug|x64.ActiveCfg = Debug|x64 @@ -1345,10 +1349,12 @@ Global {6A1969EA-9657-4828-93E0-8D21A970F868}.Release|x64.Build.0 = Release|x64 {5FAA475D-0593-454F-8601-0D7150DCA4A0}.Debug|Win32.ActiveCfg = Debug|Win32 {5FAA475D-0593-454F-8601-0D7150DCA4A0}.Debug|Win32.Build.0 = Debug|Win32 - {5FAA475D-0593-454F-8601-0D7150DCA4A0}.Debug|x64.ActiveCfg = Debug|Win32 + {5FAA475D-0593-454F-8601-0D7150DCA4A0}.Debug|x64.ActiveCfg = Debug|x64 + {5FAA475D-0593-454F-8601-0D7150DCA4A0}.Debug|x64.Build.0 = Debug|x64 {5FAA475D-0593-454F-8601-0D7150DCA4A0}.Release|Win32.ActiveCfg = Release|Win32 {5FAA475D-0593-454F-8601-0D7150DCA4A0}.Release|Win32.Build.0 = Release|Win32 - {5FAA475D-0593-454F-8601-0D7150DCA4A0}.Release|x64.ActiveCfg = Release|Win32 + {5FAA475D-0593-454F-8601-0D7150DCA4A0}.Release|x64.ActiveCfg = Release|x64 + {5FAA475D-0593-454F-8601-0D7150DCA4A0}.Release|x64.Build.0 = Release|x64 {D5E2FEC1-B29A-476C-BD41-469FE282EE0F}.Debug|Win32.ActiveCfg = Debug|Win32 {D5E2FEC1-B29A-476C-BD41-469FE282EE0F}.Debug|Win32.Build.0 = Debug|Win32 {D5E2FEC1-B29A-476C-BD41-469FE282EE0F}.Debug|x64.ActiveCfg = Debug|x64 @@ -1367,10 +1373,12 @@ Global {C5AB34D2-15F5-4CBA-8F42-DB48A4E52910}.Release|x64.Build.0 = Release|x64 {F6B2FB04-4FFD-419F-BC9F-8CC43F00C2B0}.Debug|Win32.ActiveCfg = Debug|Win32 {F6B2FB04-4FFD-419F-BC9F-8CC43F00C2B0}.Debug|Win32.Build.0 = Debug|Win32 - {F6B2FB04-4FFD-419F-BC9F-8CC43F00C2B0}.Debug|x64.ActiveCfg = Debug|Win32 + {F6B2FB04-4FFD-419F-BC9F-8CC43F00C2B0}.Debug|x64.ActiveCfg = Debug|x64 + {F6B2FB04-4FFD-419F-BC9F-8CC43F00C2B0}.Debug|x64.Build.0 = Debug|x64 {F6B2FB04-4FFD-419F-BC9F-8CC43F00C2B0}.Release|Win32.ActiveCfg = Release|Win32 {F6B2FB04-4FFD-419F-BC9F-8CC43F00C2B0}.Release|Win32.Build.0 = Release|Win32 - {F6B2FB04-4FFD-419F-BC9F-8CC43F00C2B0}.Release|x64.ActiveCfg = Release|Win32 + {F6B2FB04-4FFD-419F-BC9F-8CC43F00C2B0}.Release|x64.ActiveCfg = Release|x64 + {F6B2FB04-4FFD-419F-BC9F-8CC43F00C2B0}.Release|x64.Build.0 = Release|x64 {3CE5572B-B7B0-4D1C-9D10-4622FBA6198E}.Debug|Win32.ActiveCfg = Debug|Win32 {3CE5572B-B7B0-4D1C-9D10-4622FBA6198E}.Debug|Win32.Build.0 = Debug|Win32 {3CE5572B-B7B0-4D1C-9D10-4622FBA6198E}.Debug|x64.ActiveCfg = Debug|x64 @@ -1380,6 +1388,7 @@ Global {3CE5572B-B7B0-4D1C-9D10-4622FBA6198E}.Release|x64.ActiveCfg = Release|x64 {3CE5572B-B7B0-4D1C-9D10-4622FBA6198E}.Release|x64.Build.0 = Release|x64 {E38B4212-53BC-49A7-B821-9A99DB4774C6}.Debug|Win32.ActiveCfg = Release|x64 + {E38B4212-53BC-49A7-B821-9A99DB4774C6}.Debug|Win32.Build.0 = Release|x64 {E38B4212-53BC-49A7-B821-9A99DB4774C6}.Debug|x64.ActiveCfg = Release|x64 {E38B4212-53BC-49A7-B821-9A99DB4774C6}.Debug|x64.Build.0 = Release|x64 {E38B4212-53BC-49A7-B821-9A99DB4774C6}.Release|Win32.ActiveCfg = Release|Win32 diff --git a/plugins/HistoryLinkListPlus/linklist.vcxproj b/plugins/HistoryLinkListPlus/linklist.vcxproj index 20a084fb1e..ac1dbbf52a 100644 --- a/plugins/HistoryLinkListPlus/linklist.vcxproj +++ b/plugins/HistoryLinkListPlus/linklist.vcxproj @@ -19,30 +19,24 @@ - - LinkList DynamicLibrary - false Unicode DynamicLibrary - false Unicode DynamicLibrary - false Unicode true DynamicLibrary - false Unicode true @@ -66,26 +60,20 @@ - - $(SolutionDir)$(Configuration)/Plugins\ - false - $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ - - - $(SolutionDir)$(Configuration)64/Plugins\ - false - $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ - - - true - $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ - - - $(SolutionDir)$(Configuration)64/Plugins\ - false - $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ - true + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(Configuration)\Plugins\ + $(SolutionDir)$(Configuration)64\Plugins\ + $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ + $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + $(SolutionDir)$(Configuration)\Plugins\ + $(SolutionDir)$(Configuration)64\Plugins\ + $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ + $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + true + true + true + true @@ -93,43 +81,27 @@ AnySuitable true Full - true - Level4 + Level3 WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) true Size true true - CompileAsC - - true - NDEBUG;%(PreprocessorDefinitions) - .\Release\linklist.tlb - true - Win32 - - 0x0407 NDEBUG;%(PreprocessorDefinitions) + ..\..\include\msapi - - true - - true true Windows $(IntDir)$(TargetName).lib - - comctl32.lib;%(AdditionalDependencies) - true - UseLinkTimeCodeGeneration true true true + false @@ -139,39 +111,27 @@ true true Full - true Level3 - WIN32;NDEBUG;_WINDOWS;_USRDLL;LINKLIST_EXPORTS;%(PreprocessorDefinitions) - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + WIN64;NDEBUG;_WINDOWS;_USRDLL;LINKLIST_EXPORTS;%(PreprocessorDefinitions) + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) true Size true true - CompileAsC - - true - NDEBUG;%(PreprocessorDefinitions) - .\Release\linklist.tlb - true - - 0x0407 NDEBUG;%(PreprocessorDefinitions) + ..\..\include\msapi - - true - true Windows comctl32.lib;%(AdditionalDependencies) - true - UseLinkTimeCodeGeneration true true $(IntDir)$(TargetName).lib true + false @@ -179,72 +139,48 @@ MultiThreadedDebugDLL false Disabled - true - Level4 + Level3 true - ProgramDatabase + EditAndContinue WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) EnableFastChecks - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) - CompileAsC + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - - true - _DEBUG;%(PreprocessorDefinitions) - .\Debug\linklist.tlb - true - Win32 - - 0x0407 _DEBUG;%(PreprocessorDefinitions) + ..\..\include\msapi - - true - true true Windows comctl32.lib;%(AdditionalDependencies) $(IntDir)$(TargetName).lib + false MultiThreadedDebugDLL - true - Level4 - ProgramDatabase - WIN32;_WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + Level3 + WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) EnableFastChecks - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) false Disabled true - CompileAsC - - true - _DEBUG;%(PreprocessorDefinitions) - .\Debug\linklist.tlb - true - - 0x0407 _DEBUG;%(PreprocessorDefinitions) + ..\..\include\msapi - - true - true Windows $(IntDir)$(TargetName).lib - - true comctl32.lib;%(AdditionalDependencies) + false diff --git a/plugins/JSON/libjson.vcxproj b/plugins/JSON/libjson.vcxproj index 5cec684c2a..33cd1ad020 100644 --- a/plugins/JSON/libjson.vcxproj +++ b/plugins/JSON/libjson.vcxproj @@ -5,16 +5,22 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {F6B2FB04-4FFD-419F-BC9F-8CC43F00C2B0} - libjson - Win32Proj - libJSON + LibJSON @@ -22,31 +28,49 @@ Unicode true + + DynamicLibrary + Unicode + true + DynamicLibrary Unicode + + DynamicLibrary + Unicode + + + + + + + <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ - true - $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ - false - false + $(SolutionDir)$(Configuration)\Plugins\ + $(SolutionDir)$(Configuration)64\Plugins\ + $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ + $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + $(SolutionDir)$(Configuration)\Plugins\ + $(SolutionDir)$(Configuration)64\Plugins\ + $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ + $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ true + true true + true @@ -55,29 +79,61 @@ true EnableFastChecks MultiThreadedDebugDLL - - Level3 EditAndContinue - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + + + true + Windows + $(IntDir)$(TargetName).lib + comctl32.lib;%(AdditionalDependencies) + false + + + + + Disabled + WIN64;_DEBUG;_WINDOWS;_USRDLL;LIBJSON_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Level3 + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) true Windows - MachineX86 $(IntDir)$(TargetName).lib + comctl32.lib;%(AdditionalDependencies) + false WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBJSON_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDLL - - Level3 - - - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + Full + Speed + true + + + true + Windows + true + true + $(IntDir)$(TargetName).lib + comctl32.lib;%(AdditionalDependencies) + false + + + + + WIN64;NDEBUG;_WINDOWS;_USRDLL;LIBJSON_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + MultiThreadedDLL + Level3 + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) Full Speed true @@ -87,8 +143,9 @@ Windows true true - MachineX86 $(IntDir)$(TargetName).lib + comctl32.lib;%(AdditionalDependencies) + false diff --git a/plugins/KeyboardNotify/KeyboardNotify_10.vcxproj b/plugins/KeyboardNotify/KeyboardNotify_10.vcxproj index fc6ed8ba11..1676362bc4 100644 --- a/plugins/KeyboardNotify/KeyboardNotify_10.vcxproj +++ b/plugins/KeyboardNotify/KeyboardNotify_10.vcxproj @@ -18,38 +18,9 @@ x64 - - - - - - - - - - - - - - - - - - - - - - - - - - - KeyboardNotify {A9265E36-7F2D-440C-BF3E-F447FDB6200F} - KeyboardNotify - Win32Proj @@ -88,33 +59,25 @@ <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)64/Plugins\ - $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ - $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ - $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)64/Plugins\ - $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ - $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ - AllRules.ruleset - AllRules.ruleset - - - - - AllRules.ruleset - AllRules.ruleset - - - - + $(SolutionDir)$(Configuration)\Plugins\ + $(SolutionDir)$(Configuration)64\Plugins\ + $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ + $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + $(SolutionDir)$(Configuration)\Plugins\ + $(SolutionDir)$(Configuration)64\Plugins\ + $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ + $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + true + true + true + true Disabled - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;KEYBORDNOTIFY_EXPORTS;%(PreprocessorDefinitions) - MultiThreadedDebug + MultiThreadedDebugDLL Level3 EditAndContinue 4996 @@ -123,53 +86,42 @@ true Windows false - - $(IntDir)$(TargetName).lib - MachineX86 - - comctl32.lib;%(AdditionalDependencies) - - - - + + ..\..\include\msapi + _DEBUG;%(PreprocessorDefinitions) + Disabled - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;KEYBORDNOTIFY_EXPORTS;%(PreprocessorDefinitions) - MultiThreadedDebug + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + WIN64;_DEBUG;_WINDOWS;_USRDLL;KEYBORDNOTIFY_EXPORTS;%(PreprocessorDefinitions) + MultiThreadedDebugDLL Level3 - EditAndContinue 4996 - Use - Common.h - Wininet.lib;urlmon.lib;%(AdditionalDependencies) + comctl32.lib;%(AdditionalDependencies) true Windows false - - $(IntDir)$(TargetName).lib - - - - + + ..\..\include\msapi + _DEBUG;%(PreprocessorDefinitions) + Full Size - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;KEYBORDNOTIFY_EXPORTS;%(PreprocessorDefinitions) Level3 - ProgramDatabase 4996 MultiThreadedDLL @@ -179,44 +131,65 @@ true true false - - $(IntDir)$(TargetName).lib - MachineX86 - - true - - - - + + ..\..\include\msapi + NDEBUG;%(PreprocessorDefinitions) + Full Size - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;KEYBORDNOTIFY_EXPORTS;%(PreprocessorDefinitions) + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + WIN64;NDEBUG;_WINDOWS;_USRDLL;KEYBORDNOTIFY_EXPORTS;%(PreprocessorDefinitions) Level3 - ProgramDatabase 4996 MultiThreadedDLL - Use - Common.h - Wininet.lib;urlmon.lib;%(AdditionalDependencies) + comctl32.lib;%(AdditionalDependencies) Windows true true false - - $(IntDir)$(TargetName).lib true + + ..\..\include\msapi + NDEBUG;%(PreprocessorDefinitions) + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/LangMan/langman.vcxproj b/plugins/LangMan/langman.vcxproj index 64af9a916e..bbf073fe24 100644 --- a/plugins/LangMan/langman.vcxproj +++ b/plugins/LangMan/langman.vcxproj @@ -5,26 +5,40 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {F2ABCBFB-FEB8-49DF-B166-C2FA5148ACE1} - langman LangMan DynamicLibrary - false + Unicode + true + + + DynamicLibrary Unicode true DynamicLibrary - false + Unicode + + + DynamicLibrary Unicode @@ -34,169 +48,159 @@ + + + + + + + + <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ + $(SolutionDir)$(Configuration)\Plugins\ + $(SolutionDir)$(Configuration)64\Plugins\ + $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ + $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ true - true - $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ + true + $(SolutionDir)$(Configuration)\Plugins\ + $(SolutionDir)$(Configuration)64\Plugins\ + $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ + $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ true - false - $(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include;$(SolutionDir)\..\SVN\Miranda\Trunk\miranda\include - false + true - - _DEBUG;UNICODE;_UNICODE;%(PreprocessorDefinitions) - true - true - Win32 - .\temp/Debug/Unicode/langman.tlb - - - Disabled - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) _DEBUG;UNICODE;WIN32;_WINDOWS;_USRDLL;STRICT;LANGMAN_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL - true - Level4 - true + Level3 EditAndContinue Use common.h - _DEBUG;UNICODE;_UNICODE;%(PreprocessorDefinitions) - 0x0809 - ..\..\include;%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + ..\..\include\msapi + + + comctl32.lib;%(AdditionalDependencies) + true + 0x24100000 + false + $(IntDir)$(TargetName).lib + Windows + + + + + Disabled + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + WIN64;_DEBUG;UNICODE;_WINDOWS;_USRDLL;STRICT;LANGMAN_EXPORTS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Level3 + Use + common.h + + + _DEBUG;%(PreprocessorDefinitions) + ..\..\include\msapi comctl32.lib;%(AdditionalDependencies) - true - uuid.lib;OLDNAMES;%(IgnoreSpecificDefaultLibraries) true - true 0x24100000 false - - $(IntDir)$(TargetName).lib - MachineX86 + Windows - - true - - - - NDEBUG;%(PreprocessorDefinitions) - true - Win32 - .\temp/Release/Unicode/langman.tlb - - - Full OnlyExplicitInline Size - true - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) NDEBUG;UNICODE;WIN32;_WINDOWS;_USRDLL;STRICT;LANGMAN_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL false - NotSet - $(IntDir) - false Level3 - true Fast + false + false + Use + common.h true + + + NDEBUG;%(PreprocessorDefinitions) + ..\..\include\msapi + + + comctl32.lib;%(AdditionalDependencies) + true + 0x24100000 + false + $(IntDir)$(TargetName).lib + true + true + Windows + + + + + Full + OnlyExplicitInline + Size + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + WIN64;NDEBUG;UNICODE;_WINDOWS;_USRDLL;STRICT;LANGMAN_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + Level3 + Fast false - false - false - false false Use common.h - NDEBUG;UNICODE;_UNICODE;%(PreprocessorDefinitions) - 0x0809 - ..\..\include;%(AdditionalIncludeDirectories) + NDEBUG;%(PreprocessorDefinitions) + ..\..\include\msapi comctl32.lib;%(AdditionalDependencies) - true - uuid.lib;OLDNAMES;%(IgnoreSpecificDefaultLibraries) true - false - true 0x24100000 - true - - + false $(IntDir)$(TargetName).lib - MachineX86 true true - false + Windows - - true - - - $(IntDir)$(TargetName).xml - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(UndefinePreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(UndefinePreprocessorDefinitions) - + - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(UndefinePreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(UndefinePreprocessorDefinitions) Create + Create Create + Create - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(UndefinePreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(UndefinePreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(UndefinePreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(UndefinePreprocessorDefinitions) - + + @@ -207,12 +211,7 @@ - - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - + diff --git a/plugins/ListeningTo/listeningto.vcxproj b/plugins/ListeningTo/listeningto.vcxproj index 0169ccf18e..a604a106ce 100644 --- a/plugins/ListeningTo/listeningto.vcxproj +++ b/plugins/ListeningTo/listeningto.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {5FAA475D-0593-454F-8601-0D7150DCA4A0} @@ -17,13 +25,20 @@ DynamicLibrary - false + Unicode + true + + + DynamicLibrary Unicode true DynamicLibrary - false + Unicode + + + DynamicLibrary Unicode @@ -33,105 +48,136 @@ + + + + + + + + <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ - true - $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ - false + $(SolutionDir)$(Configuration)\Plugins\ + $(SolutionDir)$(Configuration)64\Plugins\ + $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ + $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + $(SolutionDir)$(Configuration)\Plugins\ + $(SolutionDir)$(Configuration)64\Plugins\ + $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ + $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + true + true + true + true - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Unicode_Debug/listeningto.tlb - - - Disabled - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;UNICODE;_USRDLL;%(PreprocessorDefinitions) - MultiThreadedDebug - true + MultiThreadedDebugDLL Level3 - true EditAndContinue EnableFastChecks + 4996;%(DisableSpecificWarnings) - NDEBUG;%(PreprocessorDefinitions) - 0x0417 + _DEBUG;%(PreprocessorDefinitions) + ..\..\include\msapi + + + true + 0x3EC20000 + false + $(IntDir)$(TargetName).lib + comctl32.lib;%(AdditionalDependencies) + Windows + + + + + Disabled + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + WIN64;_DEBUG;_WINDOWS;UNICODE;_USRDLL;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + Level3 + EnableFastChecks + 4996;%(DisableSpecificWarnings) + + + _DEBUG;%(PreprocessorDefinitions) + ..\..\include\msapi - /ALIGN:4096 /filealign:0x200 /ignore:4108 %(AdditionalOptions) - true true 0x3EC20000 false - - $(IntDir)$(TargetName).lib - MachineX86 - true + comctl32.lib;%(AdditionalDependencies) + Windows - - true - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Unicode_Release/listeningto.tlb - - - Full OnlyExplicitInline - ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;UNICODE;_USRDLL;%(PreprocessorDefinitions) true MultiThreadedDLL true - true Level3 - true 4996;%(DisableSpecificWarnings) Size NDEBUG;%(PreprocessorDefinitions) - 0x0417 + ..\..\include\msapi - true 0x3EC20000 false - - $(IntDir)$(TargetName).lib - MachineX86 true true true + comctl32.lib;%(AdditionalDependencies) + Windows + + + + + Full + OnlyExplicitInline + ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + WIN64;NDEBUG;_WINDOWS;UNICODE;_USRDLL;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + Level3 + 4996;%(DisableSpecificWarnings) + Size + + + NDEBUG;%(PreprocessorDefinitions) + ..\..\include\msapi + + + 0x3EC20000 + false + $(IntDir)$(TargetName).lib + true + true + true + comctl32.lib;%(AdditionalDependencies) + Windows - - true - $(IntDir)$(TargetName).bsc - @@ -162,85 +208,22 @@ - - %(PreprocessorDefinitions) - %(PreprocessorDefinitions) - + - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - + + + + + + + + - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - + + + + diff --git a/plugins/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_10.vcxproj b/plugins/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_10.vcxproj index 0b6ce556a0..e78c9a07ac 100644 --- a/plugins/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_10.vcxproj +++ b/plugins/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_10.vcxproj @@ -73,12 +73,6 @@ true - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - Disabled ..\..\..\include;..\..\ExternalAPI;%(AdditionalIncludeDirectories) @@ -105,12 +99,6 @@ - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - Full OnlyExplicitInline @@ -258,12 +246,7 @@ - - %(PreprocessorDefinitions) - \Miranda\miranda\plugins\StatusPlugins;%(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - \Miranda\miranda\plugins\StatusPlugins;%(AdditionalIncludeDirectories) - + diff --git a/plugins/StatusPlugins/KeepStatus/KeepStatus_10.vcxproj b/plugins/StatusPlugins/KeepStatus/KeepStatus_10.vcxproj index ecce01a04d..f626f652ae 100644 --- a/plugins/StatusPlugins/KeepStatus/KeepStatus_10.vcxproj +++ b/plugins/StatusPlugins/KeepStatus/KeepStatus_10.vcxproj @@ -21,7 +21,6 @@ KeepStatus {D548A54E-310B-4A86-A545-64BDD5748745} - KeepStatus @@ -60,91 +59,68 @@ <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ + $(SolutionDir)$(Configuration)\Plugins\ + $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ true - $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ + $(SolutionDir)$(Configuration)\Plugins\ + $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ true - $(SolutionDir)$(Configuration)64/Plugins\ - $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ - $(SolutionDir)$(Configuration)64/Plugins\ - $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ + $(SolutionDir)$(Configuration)64\Plugins\ + $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + $(SolutionDir)$(Configuration)64\Plugins\ + $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + true + true - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug/KeepStatus.tlb - - - Disabled - ../../../include;../../ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\..\include;..\..\ExternalAPI;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;KEEPSTATUS_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Use - commonstatus.h + ..\commonstatus.h Level3 - true EditAndContinue 4996;%(DisableSpecificWarnings) _DEBUG;%(PreprocessorDefinitions) - 0x0409 + ..\..\..\include\msapi comctl32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies) - true wininet.dll;%(DelayLoadDLLs) true false - - $(IntDir)$(TargetName).lib - MachineX86 + Windows + 0x11cd0000 - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/KeepStatus.tlb - - - Full OnlyExplicitInline Size - true - ../../../include;../../ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + ..\..\..\include;..\..\ExternalAPI;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;KEEPSTATUS_EXPORTS;%(PreprocessorDefinitions) true false MultiThreadedDLL false true Fast - false Use - commonstatus.h + ..\commonstatus.h Level3 - true - ProgramDatabase - 4996;4100;%(DisableSpecificWarnings) + 4996;%(DisableSpecificWarnings) true NDEBUG;%(PreprocessorDefinitions) - 0x0409 + ..\..\..\include\msapi comctl32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies) @@ -152,32 +128,29 @@ true true true - UseLinkTimeCodeGeneration 0x11cd0000 false - - $(IntDir)$(TargetName).lib - MachineX86 + Windows Full - false false false Fast OnlyExplicitInline true Size - true - ../../../include;../../ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\..\include;..\..\ExternalAPI;%(AdditionalIncludeDirectories) true Use - commonstatus.h + ..\commonstatus.h MultiThreadedDLL - WIN64;NDEBUG;_WINDOWS;_USRDLL;_EXPORTS;%(PreprocessorDefinitions) + WIN64;NDEBUG;_WINDOWS;_USRDLL;KEEPSTATUS_EXPORTS;%(PreprocessorDefinitions) + Level3 + 4996;%(DisableSpecificWarnings) true @@ -188,65 +161,68 @@ wininet.dll;%(DelayLoadDLLs) true $(IntDir)$(TargetName).lib + Windows + false + 0x11cd0000 + + ..\..\..\include\msapi + NDEBUG;%(PreprocessorDefinitions) + - ../../../include;../../ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\..\include;..\..\ExternalAPI;%(AdditionalIncludeDirectories) Use - commonstatus.h - WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + ..\commonstatus.h + WIN64;_DEBUG;_WINDOWS;_USRDLL;KEEPSTATUS_EXPORTS;%(PreprocessorDefinitions) + Level3 + 4996;%(DisableSpecificWarnings) + Disabled + MultiThreadedDebugDLL comctl32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies) wininet.dll;%(DelayLoadDLLs) true $(IntDir)$(TargetName).lib + Windows + false + 0x11cd0000 + + ..\..\..\include\msapi + _DEBUG;%(PreprocessorDefinitions) + - - ../commonstatus.h - ../commonstatus.h - ../commonstatus.h - ../commonstatus.h - - - - - NotUsing - NotUsing - NotUsing - NotUsing - - - ../commonstatus.h - ../commonstatus.h - ../commonstatus.h - ../commonstatus.h - - + + Create + commonstatus.h Create Create Create - ../commonstatus.h - ../commonstatus.h - ../commonstatus.h - ../commonstatus.h + commonstatus.h + commonstatus.h + commonstatus.h - - ../commonstatus.h - ../commonstatus.h - ../commonstatus.h - ../commonstatus.h + + commonstatus.h + commonstatus.h + commonstatus.h + commonstatus.h - - ../commonstatus.h - ../commonstatus.h - ../commonstatus.h - ../commonstatus.h + + NotUsing + NotUsing + NotUsing + NotUsing + + + + diff --git a/protocols/IRCG/IRC_10.vcxproj b/protocols/IRCG/IRC_10.vcxproj index 93f4693f3c..c387ef2cc8 100644 --- a/protocols/IRCG/IRC_10.vcxproj +++ b/protocols/IRCG/IRC_10.vcxproj @@ -21,7 +21,6 @@ IRC {3A12F777-56A8-42EC-BD17-8F325524241E} - IRC @@ -60,142 +59,79 @@ <_ProjectFileVersion>10.0.30128.1 - $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ + $(SolutionDir)$(Configuration)\Plugins\ + $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ true - $(SolutionDir)$(Configuration)64/Plugins\ - $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ + $(SolutionDir)$(Configuration)64\Plugins\ + $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ true - $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ + $(SolutionDir)$(Configuration)\Plugins\ + $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ true - $(SolutionDir)$(Configuration)64/Plugins\ - $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ + $(SolutionDir)$(Configuration)64\Plugins\ + $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ true - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug/IRC.tlb - - - Disabled - ../../include;../../plugins/ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;IRC_EXPORTS;%(PreprocessorDefinitions) true - - EnableFastChecks MultiThreadedDebugDLL - false Use irc.h Level3 - true EditAndContinue - 4996;%(DisableSpecificWarnings) + 4996;4125;%(DisableSpecificWarnings) _DEBUG;%(PreprocessorDefinitions) - 0x0409 - ./../../include/msapi/ + ..\..\include\msapi - /DLL %(AdditionalOptions) shlwapi.lib;wsock32.lib;%(AdditionalDependencies) - true true - false 0x54010000 false $(IntDir)$(TargetName).lib - MachineX86 + Windows - - true - - - _DEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Debug/IRC.tlb - - - Disabled - ../../include;../../plugins/ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;IRC_EXPORTS;%(PreprocessorDefinitions) + ..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories) + WIN64;_DEBUG;_WINDOWS;_USRDLL;IRC_EXPORTS;%(PreprocessorDefinitions) true - - EnableFastChecks MultiThreadedDebugDLL - false Use irc.h Level3 - true - ProgramDatabase - 4996;%(DisableSpecificWarnings) + 4996;4125;%(DisableSpecificWarnings) _DEBUG;%(PreprocessorDefinitions) - 0x0409 - ./../../include/msapi/ + ..\..\include\msapi - /DLL %(AdditionalOptions) shlwapi.lib;wsock32.lib;%(AdditionalDependencies) - true true - false 0x54010000 false $(IntDir)$(TargetName).lib - MachineX64 + Windows - - true - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/IRC.tlb - - - Full OnlyExplicitInline true Size - true - ../../include;../../plugins/ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;IRC_EXPORTS;%(PreprocessorDefinitions) true false @@ -203,89 +139,59 @@ false true Fast - false Use irc.h - AssemblyAndSourceCode Level3 - true - ProgramDatabase 4996;4125;%(DisableSpecificWarnings) NDEBUG;%(PreprocessorDefinitions) - 0x0409 - ./../../include/msapi/ + ..\..\include\msapi - /DLL %(AdditionalOptions) shlwapi.lib;wsock32.lib;%(AdditionalDependencies) true true true - UseLinkTimeCodeGeneration 0x54010000 false $(IntDir)$(TargetName).lib - MachineX86 + Windows - - true - - - NDEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Release/IRC.tlb - - - Full OnlyExplicitInline true Size - true - ../../include;../../plugins/ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;IRC_EXPORTS;%(PreprocessorDefinitions) + ..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories) + WIN64;NDEBUG;_WINDOWS;_USRDLL;IRC_EXPORTS;%(PreprocessorDefinitions) true false MultiThreadedDLL false true Fast - false Use irc.h - AssemblyAndSourceCode Level3 - true - ProgramDatabase 4996;4125;%(DisableSpecificWarnings) NDEBUG;%(PreprocessorDefinitions) - 0x0409 - ./../../include/msapi/ + ..\..\include\msapi - /DLL %(AdditionalOptions) shlwapi.lib;wsock32.lib;%(AdditionalDependencies) true true true - UseLinkTimeCodeGeneration 0x54010000 false $(IntDir)$(TargetName).lib - MachineX64 + Windows - - true - diff --git a/protocols/JabberG/jabber_10.vcxproj b/protocols/JabberG/jabber_10.vcxproj index 5a6857a9a7..9b01471461 100644 --- a/protocols/JabberG/jabber_10.vcxproj +++ b/protocols/JabberG/jabber_10.vcxproj @@ -21,28 +21,23 @@ Jabber {33276462-8313-4192-8306-13717ECCA60A} - jabber DynamicLibrary - false Unicode DynamicLibrary - false Unicode true DynamicLibrary - false Unicode DynamicLibrary - false Unicode true @@ -64,48 +59,26 @@ <_ProjectFileVersion>10.0.30128.1 - $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ + $(SolutionDir)$(Configuration)\Plugins\ + $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ true - $(SolutionDir)$(Configuration)64/Plugins\ - $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ + $(SolutionDir)$(Configuration)64\Plugins\ + $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ true - $(SolutionDir)$(Configuration)/Plugins\ - $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ - $(SolutionDir)$(Configuration)64/Plugins\ - $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - - AllRules.ruleset - - + $(SolutionDir)$(Configuration)\Plugins\ + $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ + $(SolutionDir)$(Configuration)64\Plugins\ + $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ true true - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Release/jabber.tlb - - - Full OnlyExplicitInline true Size - true - ../../include;../../plugins/ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;JABBER_EXPORTS;%(PreprocessorDefinitions) true false @@ -113,95 +86,68 @@ false true Fast - false Use jabber.h Level3 - ProgramDatabase 4996;%(DisableSpecificWarnings) NDEBUG;%(PreprocessorDefinitions) - 0x0409 - ./../../include/msapi/ + ..\..\include\msapi /ALIGN:4096 /ignore:4108 %(AdditionalOptions) - wsock32.lib;version.lib;comctl32.lib;%(AdditionalDependencies) + wsock32.lib;comctl32.lib;%(AdditionalDependencies) 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 true - UseLinkTimeCodeGeneration 0x32500000 false $(IntDir)$(TargetName).lib - MachineX86 + Windows - - NDEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Release/jabber.tlb - - - Full OnlyExplicitInline true Size - true - ../../include;../../plugins/ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;JABBER_EXPORTS;%(PreprocessorDefinitions) + ..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories) + WIN64;NDEBUG;_WINDOWS;_USRDLL;JABBER_EXPORTS;%(PreprocessorDefinitions) true false MultiThreadedDLL false true Fast - false Use jabber.h Level3 - ProgramDatabase 4996;%(DisableSpecificWarnings) NDEBUG;%(PreprocessorDefinitions) - 0x0409 - ./../../include/msapi/ + ..\..\include\msapi /ALIGN:4096 /ignore:4108 %(AdditionalOptions) - wsock32.lib;version.lib;comctl32.lib;%(AdditionalDependencies) - type=%27Win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27*%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies) + wsock32.lib;comctl32.lib;%(AdditionalDependencies) + type=%27Win64%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27X64%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies) true true true - UseLinkTimeCodeGeneration 0x32500000 false $(IntDir)$(TargetName).lib - MachineX64 + Windows - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\Debug/jabber.tlb - - - Disabled - ../../include;../../plugins/ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;JABBER_EXPORTS;%(PreprocessorDefinitions) false EnableFastChecks @@ -215,33 +161,23 @@ _DEBUG;%(PreprocessorDefinitions) - 0x0409 - ./../../include/msapi/ + ..\..\include\msapi - wsock32.lib;version.lib;comctl32.lib;%(AdditionalDependencies) - true + wsock32.lib;comctl32.lib;%(AdditionalDependencies) true 0x32500000 false - MachineX86 $(IntDir)$(TargetName).lib + Windows + 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) - - _DEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\Debug/jabber.tlb - - - Disabled - ../../include;../../plugins/ExternalAPI;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;JABBER_EXPORTS;%(PreprocessorDefinitions) + ..\..\include;..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories) + WIN64;_DEBUG;_WINDOWS;_USRDLL;JABBER_EXPORTS;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL @@ -249,22 +185,20 @@ Use jabber.h Level3 - ProgramDatabase 4996;%(DisableSpecificWarnings) _DEBUG;%(PreprocessorDefinitions) - 0x0409 - ./../../include/msapi/ + ..\..\include\msapi - wsock32.lib;version.lib;comctl32.lib;%(AdditionalDependencies) - type=%27Win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27*%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies) + wsock32.lib;comctl32.lib;%(AdditionalDependencies) + type=%27Win64%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27X64%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies) true 0x32500000 false - MachineX64 $(IntDir)$(TargetName).lib + Windows -- cgit v1.2.3