From fede19ec1c46aec110cfab8c01b982ee3f248dee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Wei=C3=9F?= Date: Sat, 18 Oct 2014 14:59:20 +0200 Subject: [PATCH] [build] Add property file to vc2010 project. This simplifies custom build configurations, especially for automated build environments. * builds/windows/vc2010/freetype.user.props: New configuration file. * builds/windows/vc2010/freetype.vcxproj: Include `freetype.user.props' and use its data fields. * builds/windows/vc2010/index.html: Updated. --- ChangeLog | 14 ++++ builds/windows/vc2010/freetype.user.props | 64 +++++++++++++++ builds/windows/vc2010/freetype.vcxproj | 97 ++++++++++++++--------- builds/windows/vc2010/index.html | 22 +++-- 4 files changed, 155 insertions(+), 42 deletions(-) create mode 100644 builds/windows/vc2010/freetype.user.props diff --git a/ChangeLog b/ChangeLog index 4d9037cbc..fed6edeec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,20 @@ * src/truetype/ttobjs.c (tt_size_init_bytecode): Updated. +2014-10-18 David Weiß + + [build] Add property file to vc2010 project. + + This simplifies custom build configurations, especially for + automated build environments. + + * builds/windows/vc2010/freetype.user.props: New configuration file. + + * builds/windows/vc2010/freetype.vcxproj: Include + `freetype.user.props' and use its data fields. + + * builds/windows/vc2010/index.html: Updated. + 2014-10-18 Werner Lemberg [autofit] Add blue-zone support for Telugu. diff --git a/builds/windows/vc2010/freetype.user.props b/builds/windows/vc2010/freetype.user.props new file mode 100644 index 000000000..0e4e87ce4 --- /dev/null +++ b/builds/windows/vc2010/freetype.user.props @@ -0,0 +1,64 @@ + + + + + + + + + + + ..\..\..\devel + + + ..\..\..\..\zlib-1.2.8;..\..\..\..\libpng-1.6.12 + + + ..\..\..\..\zlib-1.2.8;..\..\..\..\libpng-1.6.12 + + + zlib.lib;libpng16.lib + + + + + + + diff --git a/builds/windows/vc2010/freetype.vcxproj b/builds/windows/vc2010/freetype.vcxproj index bca5fc39d..4e921080b 100644 --- a/builds/windows/vc2010/freetype.vcxproj +++ b/builds/windows/vc2010/freetype.vcxproj @@ -204,11 +204,12 @@ freetype253ST freetype253ST + Disabled - ..\..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions) + $(OptionsDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;$(UserDefines);%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -222,19 +223,21 @@ Disabled - _DEBUG;%(PreprocessorDefinitions) + _DEBUG;$(UserDefines);%(PreprocessorDefinitions) 0x0409 true MachineX86 + $(UserLibraryDirectories);%(AdditionalLibraryDirectories) + $(UserDependencies);%(AdditionalDependencies) Disabled - ..\..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions) + $(OptionsDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;$(UserDefines);%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -248,19 +251,21 @@ Disabled - _DEBUG;%(PreprocessorDefinitions) + _DEBUG;$(UserDefines);%(PreprocessorDefinitions) 0x0409 true MachineX64 + $(UserLibraryDirectories);%(AdditionalLibraryDirectories) + $(UserDependencies);%(AdditionalDependencies) Disabled - ..\..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + $(OptionsDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;_CRT_SECURE_NO_DEPRECATE;$(UserDefines);%(PreprocessorDefinitions) false false EnableFastChecks @@ -276,19 +281,21 @@ Disabled - _DEBUG;%(PreprocessorDefinitions) + _DEBUG;$(UserDefines);%(PreprocessorDefinitions) 0x0409 true MachineX86 + $(UserLibraryDirectories);%(AdditionalLibraryDirectories) + $(UserDependencies);%(AdditionalDependencies) Disabled - ..\..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + $(OptionsDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;_CRT_SECURE_NO_DEPRECATE;$(UserDefines);%(PreprocessorDefinitions) false false EnableFastChecks @@ -304,19 +311,21 @@ Disabled - _DEBUG;%(PreprocessorDefinitions) + _DEBUG;$(UserDefines);%(PreprocessorDefinitions) 0x0409 true MachineX64 + $(UserLibraryDirectories);%(AdditionalLibraryDirectories) + $(UserDependencies);%(AdditionalDependencies) Disabled - ..\..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions) + $(OptionsDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;$(UserDefines);%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug true @@ -330,19 +339,21 @@ Disabled - _DEBUG;%(PreprocessorDefinitions) + _DEBUG;$(UserDefines);%(PreprocessorDefinitions) 0x0409 true MachineX86 + $(UserLibraryDirectories);%(AdditionalLibraryDirectories) + $(UserDependencies);%(AdditionalDependencies) Disabled - ..\..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions) + $(OptionsDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;$(UserDefines);%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug true @@ -356,20 +367,22 @@ Disabled - _DEBUG;%(PreprocessorDefinitions) + _DEBUG;$(UserDefines);%(PreprocessorDefinitions) 0x0409 true MachineX64 + $(UserLibraryDirectories);%(AdditionalLibraryDirectories) + $(UserDependencies);%(AdditionalDependencies) Full AnySuitable - ..\..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions) + $(OptionsDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;$(UserDefines);%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -393,21 +406,23 @@ true - NDEBUG;%(PreprocessorDefinitions) + NDEBUG;$(UserDefines);%(PreprocessorDefinitions) 0x0409 true true MachineX86 + $(UserLibraryDirectories);%(AdditionalLibraryDirectories) + $(UserDependencies);%(AdditionalDependencies) Full AnySuitable - ..\..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions) + $(OptionsDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;$(UserDefines);%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -431,21 +446,23 @@ true - NDEBUG;%(PreprocessorDefinitions) + NDEBUG;$(UserDefines);%(PreprocessorDefinitions) 0x0409 true true MachineX64 + $(UserLibraryDirectories);%(AdditionalLibraryDirectories) + $(UserDependencies);%(AdditionalDependencies) Full AnySuitable - ..\..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions) + $(OptionsDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;$(UserDefines);%(PreprocessorDefinitions) true MultiThreaded true @@ -470,21 +487,23 @@ true - NDEBUG;%(PreprocessorDefinitions) + NDEBUG;$(UserDefines);%(PreprocessorDefinitions) 0x0409 true true MachineX86 + $(UserLibraryDirectories);%(AdditionalLibraryDirectories) + $(UserDependencies);%(AdditionalDependencies) Full AnySuitable - ..\..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions) + $(OptionsDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;$(UserDefines);%(PreprocessorDefinitions) true MultiThreaded true @@ -509,21 +528,23 @@ true - NDEBUG;%(PreprocessorDefinitions) + NDEBUG;$(UserDefines);%(PreprocessorDefinitions) 0x0409 true true MachineX64 + $(UserLibraryDirectories);%(AdditionalLibraryDirectories) + $(UserDependencies);%(AdditionalDependencies) Full AnySuitable - ..\..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions) + $(OptionsDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;$(UserDefines);%(PreprocessorDefinitions) true MultiThreaded true @@ -547,21 +568,23 @@ true - NDEBUG;%(PreprocessorDefinitions) + NDEBUG;$(UserDefines);%(PreprocessorDefinitions) 0x0409 true MachineX86 + $(UserLibraryDirectories);%(AdditionalLibraryDirectories) + $(UserDependencies);%(AdditionalDependencies) Full AnySuitable - ..\..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;%(PreprocessorDefinitions) + $(OptionsDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;FT2_BUILD_LIBRARY;$(UserDefines);%(PreprocessorDefinitions) true MultiThreaded true @@ -585,13 +608,15 @@ true - NDEBUG;%(PreprocessorDefinitions) + NDEBUG;$(UserDefines);%(PreprocessorDefinitions) 0x0409 true MachineX64 + $(UserLibraryDirectories);%(AdditionalLibraryDirectories) + $(UserDependencies);%(AdditionalDependencies) diff --git a/builds/windows/vc2010/index.html b/builds/windows/vc2010/index.html index 2b2b4317d..76bb8244a 100644 --- a/builds/windows/vc2010/index.html +++ b/builds/windows/vc2010/index.html @@ -17,11 +17,11 @@ FreeType 2.5.3 sources:

     freetype253.lib     - release build
-freetype253_D.lib   - debug build
+freetype253d.lib    - debug build
 freetype253ST.lib   - release build; single threaded
-freetype253ST_D.lib - debug build;   single threaded
+freetype253STd.lib  - debug build;   single threaded
 freetype253MT.lib   - release build; multi-threaded
-freetype253MT_D.lib - debug build;   multi-threaded
    +freetype253MTd.lib - debug build; multi-threaded

Both Win32 and x64 builds are supported.

@@ -30,13 +30,23 @@ freetype253MT_D.lib - debug build; multi-threaded archives are already stored this way, so no further action is required. If you use some .tar.*z archives, be sure to configure your extracting tool to convert the line endings. For example, with WinZip, you should activate the TAR -file smart CR/LF Conversion option. Alternatively, you may consider +href="http://www.winzip.com">WinZip, you should activate the TAR +file smart CR/LF Conversion option. Alternatively, you may consider using the unix2dos or u2d utilities that are floating around, which specifically deal with this particular problem. -

Build directories are placed in the top-level objs +

Build directories are placed in the top-level objs\vc2010 directory.

+

Customization of the FreeType library is done by editing the +ftoptions.h header file in the top-level devel path. +Alternatively, you may copy the file to another directory and change the +include directory in freetype.users.props.

+ +

To configure library dependencies like zlib and libpng, +edit the freetype.users.props file in this directory. It also +simplifies automated (command-line) builds using msbuild.

+