From 6e28d7f634c8091c278e263f5891e776ae1e9603 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sun, 20 May 2012 09:27:41 +0000 Subject: project fixes git-svn-id: http://svn.miranda-ng.org/main/trunk@97 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- bin10/mir_full.sln | 2 +- plugins/Boltun/Boltun_10.vcxproj | 151 +++++++++++++++++++++++++++++++------- protocols/AimOscar/aim_10.vcxproj | 2 +- 3 files changed, 125 insertions(+), 30 deletions(-) diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln index d3dc3e27ef..c4d666f760 100644 --- a/bin10/mir_full.sln +++ b/bin10/mir_full.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Avs", "..\plugins\Avs\avs_10.vcxproj", "{7711F563-6473-4ABD-B5E3-477CE8384AD6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVS", "..\plugins\Avs\avs_10.vcxproj", "{7711F563-6473-4ABD-B5E3-477CE8384AD6}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chat", "..\plugins\Chat\chat_10.vcxproj", "{268BD296-8DD3-4715-A386-CF120398EC98}" EndProject diff --git a/plugins/Boltun/Boltun_10.vcxproj b/plugins/Boltun/Boltun_10.vcxproj index ea2517cbe0..18312183ea 100644 --- a/plugins/Boltun/Boltun_10.vcxproj +++ b/plugins/Boltun/Boltun_10.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {98DF7761-41D7-4C5C-9FFE-E5CCB3997783} @@ -18,12 +26,19 @@ DynamicLibrary - false + Unicode + + + DynamicLibrary Unicode DynamicLibrary - false + Unicode + true + + + DynamicLibrary Unicode true @@ -34,20 +49,33 @@ + + + + + + + + <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)$(Configuration)/Plugins\ + $(SolutionDir)$(Configuration)64/Plugins\ $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ - false + $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ $(SolutionDir)$(Configuration)/Plugins\ + $(SolutionDir)$(Configuration)64/Plugins\ $(SolutionDir)$(Configuration)/Obj/$(ProjectName)\ - $(ProjectName)w - $(ProjectName)w + $(SolutionDir)$(Configuration)64/Obj/$(ProjectName)\ + true + true + true + true @@ -64,41 +92,66 @@ OnlyExplicitInline true Size - true ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) NDEBUG;BOLTUN_EXPORTS;WIN32;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_UNICODE;UNICODE;_WIN32_WINNT=0x0501;%(PreprocessorDefinitions) true MultiThreadedDLL true Level3 - true - ProgramDatabase 4996;%(DisableSpecificWarnings) NDEBUG;%(PreprocessorDefinitions) - 0x0409 + ../../include/msapi - true - %(AdditionalLibraryDirectories) true $(IntDir)$(TargetName).lib - MachineX86 true true - UseLinkTimeCodeGeneration + odbc32.lib;odbccp32.lib;comctl32.lib;%(AdditionalDependencies) + Windows - + + + + + NDEBUG;%(PreprocessorDefinitions) + true true - + .\Release/Boltun.tlb + + + + + Full + OnlyExplicitInline + true + Size + ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + NDEBUG;BOLTUN_EXPORTS;WIN64;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_UNICODE;UNICODE;_WIN32_WINNT=0x0501;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + Level3 + 4996;%(DisableSpecificWarnings) + + + NDEBUG;%(PreprocessorDefinitions) + ../../include/msapi + + + true + $(IntDir)$(TargetName).lib + true + true + odbc32.lib;odbccp32.lib;comctl32.lib;%(AdditionalDependencies) + Windows + + - - copy Engine\boltun.mindw "$(SolutionDir)$(Configuration)\Plugins" - - $(OutDir)boltun.mindw;%(Outputs) - + _DEBUG;%(PreprocessorDefinitions) true @@ -114,35 +167,66 @@ _DEBUG;WIN32;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;BOLTUN_EXPORTS;_UNICODE;UNICODE;_WIN32_WINNT=0x0501;%(PreprocessorDefinitions) true EnableFastChecks - MultiThreadedDebug + MultiThreadedDebugDLL Level3 - true EditAndContinue 4996;%(DisableSpecificWarnings) _DEBUG;%(PreprocessorDefinitions) - 0x0409 + ../../include/msapi odbc32.lib;odbccp32.lib;comctl32.lib;%(AdditionalDependencies) - true - %(AdditionalLibraryDirectories) true $(IntDir)$(TargetName).lib - MachineX86 + Windows - + + + + + + _DEBUG;%(PreprocessorDefinitions) + true true - + .\Debug/Boltun.tlb + + + + + Disabled + ../../include;../ExternalAPI;%(AdditionalIncludeDirectories) + _DEBUG;WIN64;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;BOLTUN_EXPORTS;_UNICODE;UNICODE;_WIN32_WINNT=0x0501;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + Level3 + ProgramDatabase + 4996;%(DisableSpecificWarnings) + + + _DEBUG;%(PreprocessorDefinitions) + ../../include/msapi + + + odbc32.lib;odbccp32.lib;comctl32.lib;%(AdditionalDependencies) + true + $(IntDir)$(TargetName).lib + Windows + + ../include;%(AdditionalIncludeDirectories) + ../include;%(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) ../include;%(AdditionalIncludeDirectories) + ../include;%(AdditionalIncludeDirectories) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) @@ -151,14 +235,23 @@ Full + Full AnySuitable + AnySuitable true + true Speed + Speed true + true true + true true + true Default + Default ProgramDatabase + ProgramDatabase @@ -188,7 +281,9 @@ %(PreprocessorDefinitions) + %(PreprocessorDefinitions) %(PreprocessorDefinitions) + %(PreprocessorDefinitions) diff --git a/protocols/AimOscar/aim_10.vcxproj b/protocols/AimOscar/aim_10.vcxproj index 2a0f92e09b..6d2449cdcc 100644 --- a/protocols/AimOscar/aim_10.vcxproj +++ b/protocols/AimOscar/aim_10.vcxproj @@ -19,7 +19,7 @@ - Aim + AIM {736E59E5-CDCE-4C88-9C3A-E7913D45C9EC} aim -- cgit v1.2.3