From 3889cb2faa1f5520d6b26d3eb56b4f83525e4e68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Wei=C3=9F?= Date: Tue, 14 Oct 2014 11:35:16 +0200 Subject: [PATCH] [build] Better optimization settings for vc2010 solution file. * builds/windows/vc2010/freetype.sln, builds/windows/vc2010/freetype.vcxproj: Updated. --- .gitignore | 1 + ChangeLog | 7 + builds/windows/vc2010/freetype.sln | 24 +- builds/windows/vc2010/freetype.vcxproj | 622 +++++++++++++++---------- 4 files changed, 389 insertions(+), 265 deletions(-) diff --git a/.gitignore b/.gitignore index aee2e4ce1..b5db9d874 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ config.mk +objs/vc2010/ diff --git a/ChangeLog b/ChangeLog index 3c4912998..d2871e81b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2014-10-14 David Weiß + + [build] Better optimization settings for vc2010 solution file. + + * builds/windows/vc2010/freetype.sln, + builds/windows/vc2010/freetype.vcxproj: Updated. + 2014-10-14 Werner Lemberg [autofit] Adjust Devenagari character range. diff --git a/builds/windows/vc2010/freetype.sln b/builds/windows/vc2010/freetype.sln index e0f13a290..3bd176a78 100644 --- a/builds/windows/vc2010/freetype.sln +++ b/builds/windows/vc2010/freetype.sln @@ -5,20 +5,24 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype", "freetype.vcxpro EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Debug Multithreaded|Win32 = Debug Multithreaded|Win32 Debug Multithreaded|x64 = Debug Multithreaded|x64 Debug Singlethreaded|Win32 = Debug Singlethreaded|Win32 Debug Singlethreaded|x64 = Debug Singlethreaded|x64 - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 Release Multithreaded|Win32 = Release Multithreaded|Win32 Release Multithreaded|x64 = Release Multithreaded|x64 Release Singlethreaded|Win32 = Release Singlethreaded|Win32 Release Singlethreaded|x64 = Release Singlethreaded|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|Win32.ActiveCfg = Debug|Win32 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|Win32.Build.0 = Debug|Win32 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|x64.ActiveCfg = Debug|x64 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|x64.Build.0 = Debug|x64 {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Multithreaded|Win32.ActiveCfg = Debug Multithreaded|Win32 {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Multithreaded|Win32.Build.0 = Debug Multithreaded|Win32 {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Multithreaded|x64.ActiveCfg = Debug Multithreaded|x64 @@ -27,10 +31,10 @@ Global {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Singlethreaded|Win32.Build.0 = Debug Singlethreaded|Win32 {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Singlethreaded|x64.ActiveCfg = Debug Singlethreaded|x64 {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug Singlethreaded|x64.Build.0 = Debug Singlethreaded|x64 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|Win32.ActiveCfg = Debug|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|Win32.Build.0 = Debug|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|x64.ActiveCfg = Debug|x64 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|x64.Build.0 = Debug|x64 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|Win32.ActiveCfg = Release|Win32 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|Win32.Build.0 = Release|Win32 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x64.ActiveCfg = Release|x64 + {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x64.Build.0 = Release|x64 {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Multithreaded|Win32.ActiveCfg = Release Multithreaded|Win32 {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Multithreaded|Win32.Build.0 = Release Multithreaded|Win32 {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Multithreaded|x64.ActiveCfg = Release Multithreaded|x64 @@ -39,10 +43,6 @@ Global {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Singlethreaded|Win32.Build.0 = Release Singlethreaded|Win32 {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Singlethreaded|x64.ActiveCfg = Release Singlethreaded|x64 {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release Singlethreaded|x64.Build.0 = Release Singlethreaded|x64 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|Win32.ActiveCfg = Release|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|Win32.Build.0 = Release|Win32 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x64.ActiveCfg = Release|x64 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/builds/windows/vc2010/freetype.vcxproj b/builds/windows/vc2010/freetype.vcxproj index 1b9421775..bca5fc39d 100644 --- a/builds/windows/vc2010/freetype.vcxproj +++ b/builds/windows/vc2010/freetype.vcxproj @@ -1,6 +1,14 @@  + + Debug + Win32 + + + Debug + x64 + Debug Multithreaded Win32 @@ -17,12 +25,12 @@ Debug Singlethreaded x64 - - Debug + + Release Win32 - - Debug + + Release x64 @@ -41,19 +49,23 @@ Release Singlethreaded x64 - - Release - Win32 - - - Release - x64 - {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B} + + StaticLibrary + false + MultiByte + v100 + + + StaticLibrary + false + MultiByte + v100 + StaticLibrary false @@ -78,25 +90,13 @@ MultiByte v100 - + StaticLibrary false MultiByte v100 - - StaticLibrary - false - MultiByte - v100 - - - StaticLibrary - false - MultiByte - v100 - - + StaticLibrary false MultiByte @@ -114,13 +114,13 @@ MultiByte v100 - + StaticLibrary false MultiByte v100 - + StaticLibrary false MultiByte @@ -131,18 +131,36 @@ <_ProjectFileVersion>10.0.30319.1 - .\..\..\..\objs\win32\vc2010\ - .\..\..\..\objs\release\ - .\..\..\..\objs\win32\vc2010\ - .\..\..\..\objs\release_mt\ - .\..\..\..\objs\win32\vc2010\ - .\..\..\..\objs\release_st\ - .\..\..\..\objs\win32\vc2010\ - .\..\..\..\objs\debug\ - .\..\..\..\objs\win32\vc2010\ - .\..\..\..\objs\debug_st\ - .\..\..\..\objs\win32\vc2010\ - .\..\..\..\objs\debug_mt\ + .\..\..\..\objs\vc2010\$(Platform)\ + .\..\..\..\objs\vc2010\$(Platform)\$(Configuration)\ + .\..\..\..\objs\vc2010\$(Platform)\ + .\..\..\..\objs\vc2010\$(Platform)\$(Configuration)\ + .\..\..\..\objs\vc2010\$(Platform)\ + .\..\..\..\objs\vc2010\$(Platform)\$(Configuration)\ + .\..\..\..\objs\vc2010\$(Platform)\ + .\..\..\..\objs\vc2010\$(Platform)\$(Configuration)\ + .\..\..\..\objs\vc2010\$(Platform)\ + .\..\..\..\objs\vc2010\$(Platform)\$(Configuration)\ + .\..\..\..\objs\vc2010\$(Platform)\ + .\..\..\..\objs\vc2010\$(Platform)\$(Configuration)\ + .\..\..\..\objs\vc2010\$(Platform)\ + .\..\..\..\objs\vc2010\$(Platform)\$(Configuration)\ + .\..\..\..\objs\vc2010\$(Platform)\ + .\..\..\..\objs\vc2010\$(Platform)\$(Configuration)\ + .\..\..\..\objs\vc2010\$(Platform)\ + .\..\..\..\objs\vc2010\$(Platform)\$(Configuration)\ + .\..\..\..\objs\vc2010\$(Platform)\ + .\..\..\..\objs\vc2010\$(Platform)\$(Configuration)\ + .\..\..\..\objs\vc2010\$(Platform)\ + .\..\..\..\objs\vc2010\$(Platform)\$(Configuration)\ + .\..\..\..\objs\vc2010\$(Platform)\ + .\..\..\..\objs\vc2010\$(Platform)\$(Configuration)\ + AllRules.ruleset + AllRules.ruleset + + + + AllRules.ruleset AllRules.ruleset @@ -155,12 +173,12 @@ - AllRules.ruleset - AllRules.ruleset - - - - + AllRules.ruleset + AllRules.ruleset + + + + AllRules.ruleset AllRules.ruleset @@ -173,18 +191,12 @@ - AllRules.ruleset - AllRules.ruleset - - - - - freetype253_D - freetype253_D - freetype253MT_D - freetype253MT_D - freetype253ST_D - freetype253ST_D + freetype253d + freetype253d + freetype253MTd + freetype253MTd + freetype253STd + freetype253STd freetype253 freetype253 freetype253MT @@ -192,156 +204,6 @@ freetype253ST freetype253ST - - .\..\..\..\objs\win64\vc2010\ - .\..\..\..\objs\debug\ - - - - MaxSpeed - OnlyExplicitInline - ..\..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - true - Level4 - - - Default - 4001 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - true - - - - - MaxSpeed - OnlyExplicitInline - ..\..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - true - Level4 - - - Default - 4001 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - true - - - - - MaxSpeed - OnlyExplicitInline - ..\..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions) - true - MultiThreaded - true - true - Level4 - - - Default - 4001 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - true - - - - - MaxSpeed - OnlyExplicitInline - ..\..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions) - true - MultiThreaded - true - true - Level4 - - - Default - 4001 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - true - - - - - MaxSpeed - OnlyExplicitInline - ..\..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions) - true - MultiThreaded - true - true - Level4 - - - Default - 4001 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - - - - MaxSpeed - OnlyExplicitInline - ..\..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions) - true - MultiThreaded - true - true - Level4 - - - Default - 4001 - true - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - Disabled @@ -355,6 +217,9 @@ Default 4001 true + false + $(OutDir)$(TargetName).pdb + Disabled _DEBUG;%(PreprocessorDefinitions) @@ -362,6 +227,7 @@ true + MachineX86 @@ -377,6 +243,9 @@ Default 4001 true + false + $(OutDir)$(TargetName).pdb + Disabled _DEBUG;%(PreprocessorDefinitions) @@ -384,50 +253,7 @@ true - - - - - Disabled - ..\..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - true - Level4 - ProgramDatabase - Default - 4001 - true - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - true - - - - - Disabled - ..\..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - true - Level4 - ProgramDatabase - Default - 4001 - true - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - true + MachineX64 @@ -445,6 +271,9 @@ Default 4001 true + false + $(OutDir)$(TargetName).pdb + Disabled _DEBUG;%(PreprocessorDefinitions) @@ -452,6 +281,7 @@ true + MachineX86 @@ -469,6 +299,9 @@ Default 4001 true + false + $(OutDir)$(TargetName).pdb + Disabled _DEBUG;%(PreprocessorDefinitions) @@ -476,6 +309,289 @@ true + MachineX64 + + + + + Disabled + ..\..\..\include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + true + Level4 + ProgramDatabase + Default + 4001 + true + false + $(OutDir)$(TargetName).pdb + Disabled + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + true + MachineX86 + + + + + Disabled + ..\..\..\include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + true + Level4 + ProgramDatabase + Default + 4001 + true + false + $(OutDir)$(TargetName).pdb + Disabled + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + true + MachineX64 + + + + + Full + AnySuitable + ..\..\..\include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + true + Level4 + Default + 4001 + true + false + StreamingSIMDExtensions2 + false + false + false + + + true + + + true + Neither + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + true + true + MachineX86 + + + + + Full + AnySuitable + ..\..\..\include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + true + Level4 + Default + 4001 + true + false + StreamingSIMDExtensions2 + false + false + false + + + true + + + true + Neither + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + true + true + MachineX64 + + + + + Full + AnySuitable + ..\..\..\include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions) + true + MultiThreaded + true + true + Level4 + Default + 4001 + true + false + StreamingSIMDExtensions2 + false + false + false + false + + + true + + + true + Neither + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + true + true + MachineX86 + + + + + Full + AnySuitable + ..\..\..\include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions) + true + MultiThreaded + true + true + Level4 + Default + 4001 + true + false + StreamingSIMDExtensions2 + false + false + false + false + + + true + + + true + Neither + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + true + true + MachineX64 + + + + + Full + AnySuitable + ..\..\..\include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions) + true + MultiThreaded + true + true + Level4 + Default + 4001 + true + false + StreamingSIMDExtensions2 + false + false + false + + + true + + + true + Neither + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + true + MachineX86 + + + + + Full + AnySuitable + ..\..\..\include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions) + true + MultiThreaded + true + true + Level4 + Default + 4001 + true + false + StreamingSIMDExtensions2 + false + false + false + + + true + + + true + Neither + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + + true + MachineX64 @@ -1574,4 +1690,4 @@ - + \ No newline at end of file