updated to Freetype 2.5.5

This commit is contained in:
Remy Marquis 2015-01-23 15:47:28 +01:00
parent 22b0430736
commit 379ce1d29e
1134 changed files with 47183 additions and 40687 deletions

View file

@ -1,6 +1,6 @@
# CMakeLists.txt # CMakeLists.txt
# #
# Copyright 2013 by # Copyright 2013, 2014 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# Written by John Cary <cary@txcorp.com> # Written by John Cary <cary@txcorp.com>
@ -16,13 +16,28 @@
# #
# cmake CMakeLists.txt # cmake CMakeLists.txt
# #
# to create a Makefile that builds a static version of the library. For a # to create a Makefile that builds a static version of the library.
# dynamic library, use #
# For a dynamic library, use
# #
# cmake CMakeLists.txt -DBUILD_SHARED_LIBS:BOOL=true # cmake CMakeLists.txt -DBUILD_SHARED_LIBS:BOOL=true
# #
# instead. Please refer to the cmake manual for further options, in # For a framework on OS X, use
# particular, how to modify compilation and linking parameters. #
# cmake CMakeLists.txt -DBUILD_FRAMEWORK:BOOL=true -G Xcode
#
# instead.
#
# For an iOS static library, use
#
# cmake CMakeLists.txt -DIOS_PLATFORM=OS -G Xcode
#
# or
#
# cmake CMakeLists.txt -DIOS_PLATFORM=SIMULATOR -G Xcode
#
# Please refer to the cmake manual for further options, in particular, how
# to modify compilation and linking parameters.
# #
# Some notes. # Some notes.
# #
@ -37,11 +52,54 @@
cmake_minimum_required(VERSION 2.6) cmake_minimum_required(VERSION 2.6)
# CMAKE_TOOLCHAIN_FILE must be set before `project' is called, which
# configures the base build environment and references the toolchain file
if (APPLE)
if (DEFINED IOS_PLATFORM)
if (NOT "${IOS_PLATFORM}" STREQUAL "OS"
AND NOT "${IOS_PLATFORM}" STREQUAL "SIMULATOR")
message(FATAL_ERROR
"IOS_PLATFORM must be set to either OS or SIMULATOR")
endif ()
if (NOT "${CMAKE_GENERATOR}" STREQUAL "Xcode")
message(AUTHOR_WARNING
"You should use Xcode generator with IOS_PLATFORM enabled to get Universal builds.")
endif ()
if (BUILD_SHARED_LIBS)
message(FATAL_ERROR
"BUILD_SHARED_LIBS can not be on with IOS_PLATFORM enabled")
endif ()
if (BUILD_FRAMEWORK)
message(FATAL_ERROR
"BUILD_FRAMEWORK can not be on with IOS_PLATFORM enabled")
endif ()
# iOS only uses static libraries
set(BUILD_SHARED_LIBS OFF)
set(CMAKE_TOOLCHAIN_FILE
${PROJECT_SOURCE_DIR}/builds/cmake/iOS.cmake)
endif ()
else ()
if (DEFINED IOS_PLATFORM)
message(FATAL_ERROR "IOS_PLATFORM is not supported on this platform")
endif ()
endif ()
project(freetype) project(freetype)
if (BUILD_FRAMEWORK)
if (NOT "${CMAKE_GENERATOR}" STREQUAL "Xcode")
message(FATAL_ERROR
"You should use Xcode generator with BUILD_FRAMEWORK enabled")
endif ()
set(CMAKE_OSX_ARCHITECTURES "$(ARCHS_STANDARD_32_64_BIT)")
set(BUILD_SHARED_LIBS ON)
endif ()
set(VERSION_MAJOR "2") set(VERSION_MAJOR "2")
set(VERSION_MINOR "5") set(VERSION_MINOR "5")
set(VERSION_PATCH "0") set(VERSION_PATCH "5")
set(PROJECT_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}) set(PROJECT_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
# Compiler definitions for building the library # Compiler definitions for building the library
@ -51,22 +109,27 @@ add_definitions(-DFT2_BUILD_LIBRARY)
include_directories("${PROJECT_SOURCE_DIR}/include") include_directories("${PROJECT_SOURCE_DIR}/include")
# Create the configuration file # Create the configuration file
message(STATUS "Creating directory, ${PROJECT_BINARY_DIR}/include.") message(STATUS "Creating directory, ${PROJECT_BINARY_DIR}/include/freetype2.")
file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/include) file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/include/freetype2)
# For the auto-generated ftconfig.h file # For the auto-generated ftconfig.h file
include_directories("${PROJECT_BINARY_DIR}/include") include_directories(BEFORE "${PROJECT_BINARY_DIR}/include/freetype2")
message(STATUS "Creating ${PROJECT_BINARY_DIR}/include/ftconfig.h.") message(STATUS "Creating ${PROJECT_BINARY_DIR}/include/freetype2/ftconfig.h.")
execute_process( execute_process(
COMMAND sed -e "s/FT_CONFIG_OPTIONS_H/<ftoption.h>/" -e "s/FT_CONFIG_STANDARD_LIBRARY_H/<ftstdlib.h>/" -e "s?/undef ?#undef ?" COMMAND sed -e "s/FT_CONFIG_OPTIONS_H/<ftoption.h>/" -e "s/FT_CONFIG_STANDARD_LIBRARY_H/<ftstdlib.h>/" -e "s?/undef ?#undef ?"
INPUT_FILE ${PROJECT_SOURCE_DIR}/builds/unix/ftconfig.in INPUT_FILE ${PROJECT_SOURCE_DIR}/builds/unix/ftconfig.in
OUTPUT_FILE ${PROJECT_BINARY_DIR}/include/ftconfig.h OUTPUT_FILE ${PROJECT_BINARY_DIR}/include/freetype2/ftconfig.h
) )
file(GLOB PUBLIC_HEADERS "include/*.h")
file(GLOB PUBLIC_CONFIG_HEADERS "include/config/*.h")
file(GLOB PRIVATE_HEADERS "include/internal/*.h")
set(BASE_SRCS set(BASE_SRCS
src/autofit/autofit.c src/autofit/autofit.c
src/base/ftadvanc.c src/base/ftadvanc.c
src/base/ftbbox.c src/base/ftbbox.c
src/base/ftbdf.c
src/base/ftbitmap.c src/base/ftbitmap.c
src/base/ftcalc.c src/base/ftcalc.c
src/base/ftcid.c src/base/ftcid.c
@ -125,25 +188,31 @@ include_directories("src/raster")
include_directories("src/psaux") include_directories("src/psaux")
include_directories("src/psnames") include_directories("src/psnames")
if(MSVC) if (BUILD_FRAMEWORK)
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /EHsc /O2") set(BASE_SRCS
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /EHa /W3") ${BASE_SRCS}
builds/mac/freetype-Info.plist
set(CompilerFlags
CMAKE_CXX_FLAGS
CMAKE_CXX_FLAGS_DEBUG
CMAKE_CXX_FLAGS_RELEASE
CMAKE_C_FLAGS
CMAKE_C_FLAGS_DEBUG
CMAKE_C_FLAGS_RELEASE
) )
endif ()
foreach(CompilerFlag ${CompilerFlags}) add_library(freetype
string(REPLACE "/MD" "/MT" ${CompilerFlag} "${${CompilerFlag}}") ${PUBLIC_HEADERS}
endforeach() ${PUBLIC_CONFIG_HEADERS}
endif(MSVC) ${PRIVATE_HEADERS}
${BASE_SRCS}
)
add_library(freetype ${BASE_SRCS}) if (BUILD_FRAMEWORK)
set_property(SOURCE ${PUBLIC_CONFIG_HEADERS}
PROPERTY MACOSX_PACKAGE_LOCATION Headers/config
)
set_target_properties(freetype PROPERTIES
FRAMEWORK TRUE
MACOSX_FRAMEWORK_INFO_PLIST builds/mac/freetype-Info.plist
PUBLIC_HEADER "${PUBLIC_HEADERS}"
XCODE_ATTRIBUTE_INSTALL_PATH "@rpath"
)
endif ()
# Installations # Installations
# Note the trailing slash in the argument to the `DIRECTORY' directive # Note the trailing slash in the argument to the `DIRECTORY' directive
@ -155,6 +224,7 @@ install(TARGETS freetype
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
LIBRARY DESTINATION lib LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib ARCHIVE DESTINATION lib
FRAMEWORK DESTINATION Library/Frameworks
) )
# Packaging # Packaging

File diff suppressed because it is too large Load diff

View file

@ -6260,7 +6260,7 @@
Adding a new API `FT_Get_BDF_Property' to retrieve the BDF Adding a new API `FT_Get_BDF_Property' to retrieve the BDF
properties of a given PCF or BDF font. properties of a given PCF or BDF font.
* include/freetype/ftbdf.h (FT_PropertyType): New enumeration. * include/freetype/ftbdf.h (BDF_PropertyType): New enumeration.
(BDF_Property, BDF_PropertyRec): New structure. (BDF_Property, BDF_PropertyRec): New structure.
FT_Get_BDF_Property): New function. FT_Get_BDF_Property): New function.
* include/freetype/internal/bdftypes.h: Include FT_BDF_H. * include/freetype/internal/bdftypes.h: Include FT_BDF_H.

6360
freetype/ChangeLog.24 Normal file

File diff suppressed because it is too large Load diff

View file

@ -1,6 +1,6 @@
# FreeType 2 top Jamfile. # FreeType 2 top Jamfile.
# #
# Copyright 2001-2011, 2013 by # Copyright 2001-2014 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,
@ -195,7 +195,7 @@ rule RefDoc
actions RefDoc actions RefDoc
{ {
python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.5.1 --output=$(DOC_DIR) $(FT2_INCLUDE)/*.h $(FT2_INCLUDE)/config/*.h python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.5.5 --output=$(DOC_DIR) $(FT2_INCLUDE)/*.h $(FT2_INCLUDE)/config/*.h
} }
RefDoc refdoc ; RefDoc refdoc ;

View file

@ -1,3 +0,0 @@
30 mtime=1384329146.392446647
30 atime=1385276983.361964415
30 ctime=1384329146.393446635

View file

@ -1,3 +0,0 @@
30 mtime=1385335664.370350857
30 atime=1385335672.175253282
30 ctime=1385335664.370350857

View file

@ -1,2 +0,0 @@
30 atime=1385276983.302965153
30 ctime=1374498495.714319741

View file

@ -1,2 +0,0 @@
30 atime=1385276983.317964965
26 ctime=1374498498.09329

View file

@ -1,2 +0,0 @@
30 atime=1385276983.341964665
30 ctime=1374498496.743306877

View file

@ -1,2 +0,0 @@
30 atime=1385276983.345964615
30 ctime=1374498498.104289862

View file

@ -1,3 +0,0 @@
29 mtime=1385044911.04402723
29 atime=1385335585.38333833
29 ctime=1385044911.04402723

View file

@ -1,2 +0,0 @@
30 atime=1385276983.382964153
30 ctime=1374498498.114289737

View file

@ -1,3 +0,0 @@
30 mtime=1384329134.388596716
30 atime=1385335771.950005926
30 ctime=1384329134.388596716

View file

@ -1,3 +0,0 @@
29 mtime=1385044911.17602558
30 atime=1385335585.424337818
29 ctime=1385044911.17602558

View file

@ -1,3 +0,0 @@
30 mtime=1382595666.449020468
30 atime=1385276983.400963928
30 ctime=1382595666.449020468

View file

@ -1,3 +0,0 @@
30 mtime=1384258011.078056612
30 atime=1385276983.285965365
30 ctime=1384258011.078056612

View file

@ -1,3 +0,0 @@
30 mtime=1385335774.039979798
30 atime=1385335774.073979373
30 ctime=1385335774.039979798

View file

@ -1,2 +0,0 @@
29 atime=1385335783.87685682
29 ctime=1385335783.70485897

View file

@ -1,3 +0,0 @@
30 mtime=1385335773.814982611
30 atime=1385335774.461974522
30 ctime=1385335773.814982611

View file

@ -1,3 +0,0 @@
30 mtime=1385335772.746995962
30 atime=1385335783.897856557
30 ctime=1385335772.746995962

View file

@ -1,3 +0,0 @@
30 mtime=1385335772.936993587
29 atime=1385335774.45897456
30 ctime=1385335772.936993587

View file

@ -1,3 +0,0 @@
30 mtime=1384257746.282367014
30 atime=1385335760.267151982
30 ctime=1384257746.282367014

View file

@ -1,3 +0,0 @@
30 mtime=1385335774.917968822
30 atime=1385335786.748820916
30 ctime=1385335774.917968822

View file

@ -1,3 +0,0 @@
30 mtime=1385335773.278989312
30 atime=1385335784.566848194
30 ctime=1385335773.278989312

View file

@ -1,2 +0,0 @@
30 atime=1385276983.417963715
29 ctime=1374498498.03329075

View file

@ -1,3 +0,0 @@
29 mtime=1384258761.84367075
29 atime=1385276983.43596349
29 ctime=1384258761.84367075

View file

@ -1,4 +1,4 @@
FreeType 2.5.1 FreeType 2.5.5
============== ==============
Homepage: http://www.freetype.org Homepage: http://www.freetype.org
@ -16,7 +16,7 @@
the file `docs/LICENSE.TXT' for the available licenses. the file `docs/LICENSE.TXT' for the available licenses.
The FreeType 2 API reference is located in `docs/reference'; use the The FreeType 2 API reference is located in `docs/reference'; use the
file `ft2-doc.html' as the top entry point. Additional file `ft2-toc.html' as the top entry point. Additional
documentation is available as a separate package from our sites. Go documentation is available as a separate package from our sites. Go
to to
@ -24,9 +24,9 @@
and download one of the following files. and download one of the following files.
freetype-doc-2.5.1.tar.bz2 freetype-doc-2.5.5.tar.bz2
freetype-doc-2.5.1.tar.gz freetype-doc-2.5.5.tar.gz
ftdoc251.zip ftdoc255.zip
To view the documentation online, go to To view the documentation online, go to
@ -53,15 +53,15 @@
Bugs Bugs
==== ====
Please report bugs by e-mail to `freetype-devel@nongnu.org'. Don't Please submit bug reports at
forget to send a detailed explanation of the problem -- there is
nothing worse than receiving a terse message that only says `it
doesn't work'.
Alternatively, you may submit a bug report at
https://savannah.nongnu.org/bugs/?group=freetype https://savannah.nongnu.org/bugs/?group=freetype
Alternatively, you might report bugs by e-mail to
`freetype-devel@nongnu.org'. Don't forget to send a detailed
explanation of the problem -- there is nothing worse than receiving
a terse message that only says `it doesn't work'.
Enjoy! Enjoy!
@ -70,7 +70,7 @@
---------------------------------------------------------------------- ----------------------------------------------------------------------
Copyright 2006-2013 by Copyright 2006-2014 by
David Turner, Robert Wilhelm, and Werner Lemberg. David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used, This file is part of the FreeType project, and may only be used,

0
freetype/autogen.sh Normal file → Executable file
View file

View file

@ -1,3 +0,0 @@
30 mtime=1385335773.905981473
30 atime=1385335786.859819528
30 ctime=1385335773.905981473

View file

@ -1,3 +0,0 @@
30 mtime=1385335774.037979823
30 atime=1385335787.199815277
30 ctime=1385335774.037979823

View file

@ -1,3 +0,0 @@
30 mtime=1385335773.864981986
29 atime=1385335786.85481959
30 ctime=1385335773.864981986

View file

@ -1,3 +0,0 @@
30 mtime=1385335773.849982173
30 atime=1385335774.089979173
30 ctime=1385335773.849982173

View file

@ -1,3 +0,0 @@
30 mtime=1385335773.890981661
30 atime=1385335774.873969372
30 ctime=1385335773.890981661

View file

@ -1,3 +0,0 @@
30 mtime=1384257040.011196618
30 atime=1385335759.859157083
30 ctime=1384257040.011196618

View file

@ -1,3 +0,0 @@
30 mtime=1385335773.843982248
29 atime=1385335774.09097916
30 ctime=1385335773.843982248

View file

@ -1,2 +0,0 @@
29 atime=1385335774.45897456
30 ctime=1374498497.987291325

View file

@ -1,3 +0,0 @@
30 mtime=1384258291.849546485
29 atime=1385335759.86015707
30 ctime=1384258291.849546485

View file

@ -1,2 +0,0 @@
30 atime=1385335787.197815302
30 ctime=1374498498.023290875

View file

@ -1,2 +0,0 @@
30 atime=1385335774.457974572
30 ctime=1374498498.015290975

View file

@ -1,3 +0,0 @@
30 mtime=1385335773.924981236
30 atime=1385335786.869819403
30 ctime=1385335773.924981236

View file

@ -1,2 +0,0 @@
30 atime=1385335771.982005526
28 ctime=1374498497.9492918

View file

@ -1,2 +0,0 @@
30 atime=1385335787.197815302
28 ctime=1374498497.9972912

View file

@ -1,3 +0,0 @@
30 mtime=1385335773.834982361
29 atime=1385335774.09097916
30 ctime=1385335773.834982361

View file

@ -1,3 +0,0 @@
30 mtime=1385335773.957980823
30 atime=1385335787.127816177
30 ctime=1385335773.957980823

View file

@ -1,3 +0,0 @@
30 mtime=1384256999.202706795
30 atime=1385335759.862157045
30 ctime=1384256999.202706795

View file

@ -1,3 +0,0 @@
30 mtime=1385335783.762858245
30 atime=1385335786.940818515
30 ctime=1385335783.762858245

View file

@ -1,3 +0,0 @@
30 mtime=1385335773.909981423
30 atime=1385335786.865819453
30 ctime=1385335773.909981423

View file

@ -1,3 +0,0 @@
30 mtime=1385335773.827982448
30 atime=1385335786.785820453
30 ctime=1385335773.827982448

View file

@ -1,3 +0,0 @@
30 mtime=1385335774.023979998
30 atime=1385335774.089979173
30 ctime=1385335774.023979998

View file

@ -1,3 +0,0 @@
30 mtime=1384256699.382455064
30 atime=1385335759.837157358
30 ctime=1384256699.382455064

View file

@ -1,3 +0,0 @@
29 mtime=1385335772.61999755
30 atime=1385335772.674996863
29 ctime=1385335772.61999755

View file

@ -1,3 +0,0 @@
30 mtime=1384256653.087033836
30 atime=1385335759.855157133
30 ctime=1384256653.087033836

View file

@ -1,3 +0,0 @@
30 mtime=1384256831.316805657
29 atime=1385335759.85615712
30 ctime=1384256831.316805657

View file

@ -1,3 +0,0 @@
30 mtime=1384256845.205632023
30 atime=1385335759.857157108
30 ctime=1384256845.205632023

View file

@ -1,3 +0,0 @@
30 mtime=1385335772.624997488
30 atime=1385335772.674996863
30 ctime=1385335772.624997488

View file

@ -1,3 +0,0 @@
30 mtime=1385335773.897981573
30 atime=1385335786.859819528
30 ctime=1385335773.897981573

View file

@ -1,3 +0,0 @@
30 mtime=1384256772.669538849
30 atime=1385335759.491161683
30 ctime=1384256772.669538849

View file

@ -1,2 +0,0 @@
30 atime=1385335759.839157333
29 ctime=1374498497.91329225

View file

@ -1,3 +0,0 @@
30 mtime=1385335773.901981523
30 atime=1385335786.859819528
30 ctime=1385335773.901981523

View file

@ -1,3 +0,0 @@
30 mtime=1384256805.016134461
30 atime=1385335759.858157095
30 ctime=1384256805.016134461

View file

@ -1,2 +0,0 @@
30 atime=1385335786.863819478
30 ctime=1374498497.903292375

View file

@ -1,2 +0,0 @@
30 atime=1385335787.199815277
30 ctime=1374498498.022290888

View file

@ -1,2 +0,0 @@
30 atime=1385335787.199815277
28 ctime=1374498498.0212909

View file

@ -1,2 +0,0 @@
30 atime=1385335786.856819565
30 ctime=1374498497.944291863

View file

@ -1,2 +0,0 @@
30 atime=1385335786.856819565
30 ctime=1374498497.948291813

View file

@ -1,2 +0,0 @@
30 atime=1385335786.855819578
30 ctime=1374498497.946291838

View file

@ -1,2 +0,0 @@
30 atime=1385335786.855819578
30 ctime=1374498497.947291825

View file

@ -1,2 +0,0 @@
30 atime=1385335786.855819578
29 ctime=1374498497.94529185

View file

@ -1,2 +0,0 @@
29 atime=1385335786.85481959
30 ctime=1374498497.942291888

0
freetype/builds/atari/gen-purec-patch.sh Normal file → Executable file
View file

View file

@ -1,2 +0,0 @@
29 atime=1385335786.85481959
30 ctime=1374498497.834293238

View file

@ -1,2 +0,0 @@
29 atime=1385335786.85481959
30 ctime=1374498497.836293213

View file

@ -1,2 +0,0 @@
30 atime=1385335771.974005626
28 ctime=1374498497.8372932

View file

@ -0,0 +1,275 @@
# iOS.cmake
#
# Copyright 2014 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# Written by David Wimsey <david@wimsey.us>
#
# This file is part of the FreeType project, and may only be used, modified,
# and distributed under the terms of the FreeType project license,
# LICENSE.TXT. By continuing to use, modify, or distribute this file you
# indicate that you have read the license and understand and accept it
# fully.
#
#
# This file is derived from the files `Platform/Darwin.cmake' and
# `Platform/UnixPaths.cmake', which are part of CMake 2.8.4. It has been
# altered for iOS development.
# Options
# -------
#
# IOS_PLATFORM = OS | SIMULATOR
#
# This decides whether SDKS are selected from the `iPhoneOS.platform' or
# `iPhoneSimulator.platform' folders.
#
# OS - the default, used to build for iPhone and iPad physical devices,
# which have an ARM architecture.
# SIMULATOR - used to build for the Simulator platforms, which have an
# x86 architecture.
#
# CMAKE_IOS_DEVELOPER_ROOT = /path/to/platform/Developer folder
#
# By default, this location is automatically chosen based on the
# IOS_PLATFORM value above. If you manually set this variable, it
# overrides the default location and forces the use of a particular
# Developer Platform.
#
# CMAKE_IOS_SDK_ROOT = /path/to/platform/Developer/SDKs/SDK folder
#
# By default, this location is automatically chosen based on the
# CMAKE_IOS_DEVELOPER_ROOT value. In this case it is always the most
# up-to-date SDK found in the CMAKE_IOS_DEVELOPER_ROOT path. If you
# manually set this variable, it forces the use of a specific SDK
# version.
#
#
# Macros
# ------
#
# set_xcode_property (TARGET XCODE_PROPERTY XCODE_VALUE)
#
# A convenience macro for setting Xcode specific properties on targets.
#
# Example:
#
# set_xcode_property(myioslib IPHONEOS_DEPLOYMENT_TARGET "3.1")
#
# find_host_package (PROGRAM ARGS)
#
# A macro to find executable programs on the host system, not within the
# iOS environment. Thanks to the `android-cmake' project for providing
# the command.
# standard settings
set(CMAKE_SYSTEM_NAME Darwin)
set(CMAKE_SYSTEM_VERSION 1)
set(UNIX True)
set(APPLE True)
set(IOS True)
# required as of cmake 2.8.10
set(CMAKE_OSX_DEPLOYMENT_TARGET ""
CACHE STRING "Force unset of the deployment target for iOS" FORCE
)
# determine the cmake host system version so we know where to find the iOS
# SDKs
find_program(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin)
if (CMAKE_UNAME)
exec_program(uname ARGS -r OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_VERSION)
string(REGEX REPLACE "^([0-9]+)\\.([0-9]+).*$" "\\1"
DARWIN_MAJOR_VERSION "${CMAKE_HOST_SYSTEM_VERSION}")
endif (CMAKE_UNAME)
# force the compilers to gcc for iOS
include(CMakeForceCompiler)
CMAKE_FORCE_C_COMPILER(gcc gcc)
CMAKE_FORCE_CXX_COMPILER(g++ g++)
# skip the platform compiler checks for cross compiling
set(CMAKE_CXX_COMPILER_WORKS TRUE)
set(CMAKE_C_COMPILER_WORKS TRUE)
# all iOS/Darwin specific settings - some may be redundant
set(CMAKE_SHARED_LIBRARY_PREFIX "lib")
set(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib")
set(CMAKE_SHARED_MODULE_PREFIX "lib")
set(CMAKE_SHARED_MODULE_SUFFIX ".so")
set(CMAKE_MODULE_EXISTS 1)
set(CMAKE_DL_LIBS "")
set(CMAKE_C_OSX_COMPATIBILITY_VERSION_FLAG
"-compatibility_version ")
set(CMAKE_C_OSX_CURRENT_VERSION_FLAG
"-current_version ")
set(CMAKE_CXX_OSX_COMPATIBILITY_VERSION_FLAG
"${CMAKE_C_OSX_COMPATIBILITY_VERSION_FLAG}")
set(CMAKE_CXX_OSX_CURRENT_VERSION_FLAG
"${CMAKE_C_OSX_CURRENT_VERSION_FLAG}")
# hidden visibility is required for cxx on iOS
set(CMAKE_C_FLAGS_INIT "")
set(CMAKE_CXX_FLAGS_INIT
"-headerpad_max_install_names -fvisibility=hidden -fvisibility-inlines-hidden")
set(CMAKE_C_LINK_FLAGS
"-Wl,-search_paths_first ${CMAKE_C_LINK_FLAGS}")
set(CMAKE_CXX_LINK_FLAGS
"-Wl,-search_paths_first ${CMAKE_CXX_LINK_FLAGS}")
set(CMAKE_PLATFORM_HAS_INSTALLNAME 1)
set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS
"-dynamiclib -headerpad_max_install_names")
set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS
"-bundle -headerpad_max_install_names")
set(CMAKE_SHARED_MODULE_LOADER_C_FLAG
"-Wl,-bundle_loader,")
set(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG
"-Wl,-bundle_loader,")
set(CMAKE_FIND_LIBRARY_SUFFIXES
".dylib" ".so" ".a")
# hack: If a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old
# build tree (where `install_name_tool' was hardcoded), and where
# CMAKE_INSTALL_NAME_TOOL isn't in the cache and still cmake didn't
# fail in `CMakeFindBinUtils.cmake' (because it isn't rerun), hardcode
# CMAKE_INSTALL_NAME_TOOL here to `install_name_tool' so it behaves as
# it did before.
if (NOT DEFINED CMAKE_INSTALL_NAME_TOOL)
find_program(CMAKE_INSTALL_NAME_TOOL install_name_tool)
endif (NOT DEFINED CMAKE_INSTALL_NAME_TOOL)
# set up iOS platform unless specified manually with IOS_PLATFORM
if (NOT DEFINED IOS_PLATFORM)
set(IOS_PLATFORM "OS")
endif (NOT DEFINED IOS_PLATFORM)
set(IOS_PLATFORM ${IOS_PLATFORM} CACHE STRING "Type of iOS Platform")
# check the platform selection and setup for developer root
if (${IOS_PLATFORM} STREQUAL "OS")
set(IOS_PLATFORM_LOCATION "iPhoneOS.platform")
# this causes the installers to properly locate the output libraries
set(CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphoneos")
elseif (${IOS_PLATFORM} STREQUAL "SIMULATOR")
set(IOS_PLATFORM_LOCATION "iPhoneSimulator.platform")
# this causes the installers to properly locate the output libraries
set(CMAKE_XCODE_EFFECTIVE_PLATFORMS "-iphonesimulator")
else (${IOS_PLATFORM} STREQUAL "OS")
message(FATAL_ERROR
"Unsupported IOS_PLATFORM value selected. Please choose OS or SIMULATOR.")
endif (${IOS_PLATFORM} STREQUAL "OS")
# set up iOS developer location unless specified manually with
# CMAKE_IOS_DEVELOPER_ROOT --
# note that Xcode 4.3 changed the installation location; choose the most
# recent one available
set(XCODE_POST_43_ROOT
"/Applications/Xcode.app/Contents/Developer/Platforms/${IOS_PLATFORM_LOCATION}/Developer")
set(XCODE_PRE_43_ROOT
"/Developer/Platforms/${IOS_PLATFORM_LOCATION}/Developer")
if (NOT DEFINED CMAKE_IOS_DEVELOPER_ROOT)
if (EXISTS ${XCODE_POST_43_ROOT})
set(CMAKE_IOS_DEVELOPER_ROOT ${XCODE_POST_43_ROOT})
elseif (EXISTS ${XCODE_PRE_43_ROOT})
set(CMAKE_IOS_DEVELOPER_ROOT ${XCODE_PRE_43_ROOT})
endif (EXISTS ${XCODE_POST_43_ROOT})
endif (NOT DEFINED CMAKE_IOS_DEVELOPER_ROOT)
set(CMAKE_IOS_DEVELOPER_ROOT ${CMAKE_IOS_DEVELOPER_ROOT}
CACHE PATH "Location of iOS Platform"
)
# find and use the most recent iOS SDK unless specified manually with
# CMAKE_IOS_SDK_ROOT
if (NOT DEFINED CMAKE_IOS_SDK_ROOT)
file(GLOB _CMAKE_IOS_SDKS "${CMAKE_IOS_DEVELOPER_ROOT}/SDKs/*")
if (_CMAKE_IOS_SDKS)
list(SORT _CMAKE_IOS_SDKS)
list(REVERSE _CMAKE_IOS_SDKS)
list(GET _CMAKE_IOS_SDKS 0 CMAKE_IOS_SDK_ROOT)
else (_CMAKE_IOS_SDKS)
message(FATAL_ERROR
"No iOS SDK's found in default search path ${CMAKE_IOS_DEVELOPER_ROOT}. Manually set CMAKE_IOS_SDK_ROOT or install the iOS SDK.")
endif (_CMAKE_IOS_SDKS)
message(STATUS "Toolchain using default iOS SDK: ${CMAKE_IOS_SDK_ROOT}")
endif (NOT DEFINED CMAKE_IOS_SDK_ROOT)
set(CMAKE_IOS_SDK_ROOT ${CMAKE_IOS_SDK_ROOT}
CACHE PATH "Location of the selected iOS SDK"
)
# set the sysroot default to the most recent SDK
set(CMAKE_OSX_SYSROOT ${CMAKE_IOS_SDK_ROOT}
CACHE PATH "Sysroot used for iOS support"
)
# set the architecture for iOS --
# note that currently both ARCHS_STANDARD_32_BIT and
# ARCHS_UNIVERSAL_IPHONE_OS set armv7 only, so set both manually
if (${IOS_PLATFORM} STREQUAL "OS")
set(IOS_ARCH $(ARCHS_STANDARD_32_64_BIT))
else (${IOS_PLATFORM} STREQUAL "OS")
set(IOS_ARCH i386)
endif (${IOS_PLATFORM} STREQUAL "OS")
set(CMAKE_OSX_ARCHITECTURES ${IOS_ARCH}
CACHE string "Build architecture for iOS"
)
# set the find root to the iOS developer roots and to user defined paths
set(CMAKE_FIND_ROOT_PATH
${CMAKE_IOS_DEVELOPER_ROOT}
${CMAKE_IOS_SDK_ROOT}
${CMAKE_PREFIX_PATH}
CACHE string "iOS find search path root"
)
# default to searching for frameworks first
set(CMAKE_FIND_FRAMEWORK FIRST)
# set up the default search directories for frameworks
set(CMAKE_SYSTEM_FRAMEWORK_PATH
${CMAKE_IOS_SDK_ROOT}/System/Library/Frameworks
${CMAKE_IOS_SDK_ROOT}/System/Library/PrivateFrameworks
${CMAKE_IOS_SDK_ROOT}/Developer/Library/Frameworks
)
# only search the iOS SDKs, not the remainder of the host filesystem
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY)
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
# this little macro lets you set any Xcode specific property
macro(set_xcode_property TARGET XCODE_PROPERTY XCODE_VALUE)
set_property(TARGET ${TARGET}
PROPERTY XCODE_ATTRIBUTE_${XCODE_PROPERTY} ${XCODE_VALUE})
endmacro(set_xcode_property)
# this macro lets you find executable programs on the host system
macro(find_host_package)
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY NEVER)
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE NEVER)
set(IOS FALSE)
find_package(${ARGN})
set(IOS TRUE)
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY)
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
endmacro(find_host_package)
# eof

View file

@ -1,2 +0,0 @@
30 atime=1385335786.859819528
30 ctime=1374498497.924292113

View file

@ -1,2 +0,0 @@
30 atime=1385335786.857819553
30 ctime=1374498497.927292075

View file

@ -1,2 +0,0 @@
29 atime=1385335786.85881954
30 ctime=1374498497.923292125

View file

@ -1,2 +0,0 @@
30 atime=1385335786.857819553
28 ctime=1374498497.9252921

View file

@ -1,2 +0,0 @@
30 atime=1385335774.448974685
30 ctime=1382596802.907812778

View file

@ -1,2 +0,0 @@
30 atime=1385335786.859819528
30 ctime=1374498497.922292138

View file

@ -1,2 +0,0 @@
29 atime=1385335786.85881954
30 ctime=1374498497.928292063

View file

@ -1,2 +0,0 @@
29 atime=1385335786.85881954
29 ctime=1374498497.92129215

View file

@ -1,2 +0,0 @@
30 atime=1385335786.856819565
30 ctime=1374498497.926292088

View file

@ -1,2 +0,0 @@
30 atime=1385335786.857819553
30 ctime=1374498497.930292038

View file

@ -1,2 +0,0 @@
29 atime=1385335786.85881954
29 ctime=1374498497.92929205

View file

@ -1,2 +0,0 @@
30 atime=1385335786.856819565
30 ctime=1374498497.931292025

View file

@ -3,7 +3,7 @@
# #
# Copyright 1996-2003, 2006, 2008, 2013 by # Copyright 1996-2003, 2006, 2008, 2013, 2014 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,
@ -124,7 +124,7 @@ std_setup:
@echo "\`$(CONFIG_MK)' from this directory then read the INSTALL file for help." @echo "\`$(CONFIG_MK)' from this directory then read the INSTALL file for help."
@echo "" @echo ""
@echo "Otherwise, simply type \`$(MAKE)' again to build the library," @echo "Otherwise, simply type \`$(MAKE)' again to build the library,"
@echo "or \`$(MAKE) refdoc' to build the API reference (the latter needs python)." @echo "or \`$(MAKE) refdoc' to build the API reference (this needs python >= 2.6)."
@echo "" @echo ""
@$(COPY) $(CONFIG_RULES) $(CONFIG_MK) @$(COPY) $(CONFIG_RULES) $(CONFIG_MK)
@ -146,7 +146,7 @@ dos_setup:
@echo '$(CONFIG_MK)' from this directory then read the INSTALL file for help. @echo '$(CONFIG_MK)' from this directory then read the INSTALL file for help.
@type builds$(SEP)newline @type builds$(SEP)newline
@echo Otherwise, simply type 'make' again to build the library. @echo Otherwise, simply type 'make' again to build the library.
@echo or 'make refdoc' to build the API reference (the latter needs python). @echo or 'make refdoc' to build the API reference (this needs python >= 2.6).
@type builds$(SEP)newline @type builds$(SEP)newline
@$(COPY) $(subst /,$(SEP),$(CONFIG_RULES) $(CONFIG_MK)) > nul @$(COPY) $(subst /,$(SEP),$(CONFIG_RULES) $(CONFIG_MK)) > nul

View file

@ -1,2 +0,0 @@
30 atime=1385335771.974005626
30 ctime=1374498497.995291225

View file

@ -1,2 +0,0 @@
30 atime=1385335786.853819603
30 ctime=1374498497.994291238

View file

@ -1,2 +0,0 @@
30 atime=1385335786.853819603
30 ctime=1374498497.996291213

View file

@ -1,2 +0,0 @@
30 atime=1385335786.853819603
29 ctime=1374498497.99329125

View file

@ -1,2 +0,0 @@
30 atime=1385335786.853819603
30 ctime=1374498497.992291263

View file

@ -3,7 +3,7 @@
# #
# Copyright 1996-2000, 2003, 2004, 2006 by # Copyright 1996-2000, 2003, 2004, 2006, 2014 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,
@ -45,12 +45,12 @@ ifeq ($(PLATFORM),ansi)
endif endif
# We also try to recognize Dos 7.x without Windows 9X launched. # We also try to recognize Dos 7.x without Windows 9X launched.
# See builds/win32/detect.mk for explanations about the logic. # See builds/windows/detect.mk for explanations about the logic.
# #
ifeq ($(is_dos),) ifeq ($(is_dos),)
ifdef winbootdir ifdef winbootdir
#ifneq ($(OS),Windows_NT) #ifneq ($(OS),Windows_NT)
# If win32 is available, do not trigger this test. # If windows is available, do not trigger this test.
ifndef windir ifndef windir
is_dos := $(findstring Windows,$(strip $(shell ver))) is_dos := $(findstring Windows,$(strip $(shell ver)))
endif endif
@ -124,7 +124,7 @@ ifeq ($(PLATFORM),dos)
CAT := type CAT := type
# Setting COPY is a bit trickier. We can be running DJGPP on some # Setting COPY is a bit trickier. We can be running DJGPP on some
# Windows NT derivatives, like XP. See builds/win32/detect.mk for # Windows NT derivatives, like XP. See builds/windows/detect.mk for
# explanations why we need hacking here. # explanations why we need hacking here.
# #
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)

View file

@ -3,7 +3,7 @@
# #
# Copyright 1996-2006, 2008, 2013 by # Copyright 1996-2006, 2008, 2013, 2014 by
# David Turner, Robert Wilhelm, and Werner Lemberg. # David Turner, Robert Wilhelm, and Werner Lemberg.
# #
# This file is part of the FreeType project, and may only be used, modified, # This file is part of the FreeType project, and may only be used, modified,
@ -126,6 +126,14 @@ INCLUDES := $(subst /,$(COMPILER_SEP),$(OBJ_DIR) \
INCLUDE_FLAGS := $(INCLUDES:%=$I%) INCLUDE_FLAGS := $(INCLUDES:%=$I%)
ifdef DEVEL_DIR
# We assume that all library dependencies for FreeType are fulfilled for a
# development build, so we directly access the necessary include directory
# information using `pkg-config'.
INCLUDE_FLAGS += $(shell pkg-config --cflags libpng \
harfbuzz )
endif
# C flags used for the compilation of an object file. This must include at # C flags used for the compilation of an object file. This must include at
# least the paths for the `base' and `builds/<system>' directories; # least the paths for the `base' and `builds/<system>' directories;
@ -147,13 +155,14 @@ ifneq ($(wildcard $(OBJ_DIR)/ftoption.h),)
FTOPTION_FLAG := $DFT_CONFIG_OPTIONS_H="<ftoption.h>" FTOPTION_FLAG := $DFT_CONFIG_OPTIONS_H="<ftoption.h>"
endif endif
# Note that a build with the `configure' script uses $(CFLAGS) only.
#
FT_CFLAGS = $(CPPFLAGS) \ FT_CFLAGS = $(CPPFLAGS) \
$(INCLUDE_FLAGS) \ $(INCLUDE_FLAGS) \
$(CFLAGS) \ $(CFLAGS) \
$DFT2_BUILD_LIBRARY \ $DFT2_BUILD_LIBRARY \
$DFT_CONFIG_MODULES_H="<ftmodule.h>" \ $DFT_CONFIG_MODULES_H="<ftmodule.h>" \
$(FTOPTION_FLAG) $(FTOPTION_FLAG)
FT_CC = $(CC) $(FT_CFLAGS)
FT_COMPILE = $(CC) $(ANSIFLAGS) $(FT_CFLAGS) FT_COMPILE = $(CC) $(ANSIFLAGS) $(FT_CFLAGS)
@ -288,19 +297,16 @@ ifneq ($(findstring refdoc,$(MAKECMDGOALS)),)
version := $(major).$(minor).$(patch) version := $(major).$(minor).$(patch)
endif endif
# We write-protect the docmaker directory to suppress generation # Option `-B' disables generation of .pyc files (available since python 2.6)
# of .pyc files.
# #
refdoc: refdoc:
-chmod -w $(SRC_DIR)/tools/docmaker python -B $(SRC_DIR)/tools/docmaker/docmaker.py \
python $(SRC_DIR)/tools/docmaker/docmaker.py \ --prefix=ft2 \
--prefix=ft2 \ --title=FreeType-$(version) \
--title=FreeType-$(version) \ --output=$(DOC_DIR) \
--output=$(DOC_DIR) \ $(PUBLIC_DIR)/*.h \
$(PUBLIC_DIR)/*.h \ $(PUBLIC_DIR)/config/*.h \
$(PUBLIC_DIR)/config/*.h \ $(PUBLIC_DIR)/cache/*.h
$(PUBLIC_DIR)/cache/*.h
-chmod +w $(SRC_DIR)/tools/docmaker
.PHONY: clean_project_std distclean_project_std .PHONY: clean_project_std distclean_project_std

View file

@ -1,2 +0,0 @@
30 atime=1385335786.924818715
30 ctime=1374498498.012291013

View file

@ -1,2 +0,0 @@
30 atime=1385335786.940818515
27 ctime=1374498498.013291

View file

@ -1,2 +0,0 @@
30 atime=1385335786.940818515
30 ctime=1374498498.007291075

View file

@ -1,2 +0,0 @@
30 atime=1385335786.924818715
30 ctime=1374498498.008291063

View file

@ -1,3 +0,0 @@
30 mtime=1383506957.470300723
30 atime=1385335786.939818528
30 ctime=1383506957.470300723

Some files were not shown because too many files have changed in this diff Show more