Update freetype package
Also use the new build feature rules
This commit is contained in:
parent
e2c74e414c
commit
29f8805f6c
@ -389,46 +389,31 @@ if $(TARGET_ARCH) = x86 {
|
||||
|
||||
# Freetype
|
||||
local freetypeBaseURL = $(baseURL)/lib ;
|
||||
if $(TARGET_ARCH) = ppc || $(TARGET_ARCH) = x86 || $(TARGET_ARCH) = x86_64 || $(TARGET_ARCH) = arm {
|
||||
if $(TARGET_ARCH) in arm ppc x86 x86_64 {
|
||||
if $(TARGET_ARCH) = arm {
|
||||
HAIKU_FREETYPE_FILE = freetype-2.4.9-arm-2012-11-21.zip ;
|
||||
HAIKU_FREETYPE_PACKAGE = freetype-2.4.9-arm-2012-11-21.zip ;
|
||||
} else if $(TARGET_ARCH) = ppc {
|
||||
HAIKU_FREETYPE_FILE = freetype-2.4.9-ppc-gcc4-2012-06-26.zip ;
|
||||
HAIKU_FREETYPE_PACKAGE = freetype-2.4.9-ppc-gcc4-2012-06-26.zip ;
|
||||
} else if $(TARGET_ARCH) = x86_64 {
|
||||
HAIKU_FREETYPE_FILE = freetype-2.4.9-x86_64-2012-08-04.zip ;
|
||||
HAIKU_FREETYPE_PACKAGE = freetype-2.4.9-x86_64-2012-08-04.zip ;
|
||||
} else if $(HAIKU_GCC_VERSION[1]) >= 4 {
|
||||
HAIKU_FREETYPE_FILE = freetype-2.4.9-r1a4-x86-gcc4-2012-09-02.zip ;
|
||||
HAIKU_FREETYPE_PACKAGE = freetype-2.4.9-r1a4-x86-gcc4-2012-09-02.zip ;
|
||||
} else {
|
||||
HAIKU_FREETYPE_FILE = freetype-2.4.9-r1a4-x86-gcc2-2012-08-28.zip ;
|
||||
HAIKU_FREETYPE_PACKAGE = freetype-2.4.9-1-x86_gcc2.hpkg ;
|
||||
HAIKU_FREETYPE_DEVEL_PACKAGE = freetype_devel-2.4.9-1-x86_gcc2.hpkg ;
|
||||
}
|
||||
|
||||
local freetypeZipFile = [ DownloadFile $(HAIKU_FREETYPE_FILE)
|
||||
: $(freetypeBaseURL)/$(HAIKU_FREETYPE_FILE) ] ;
|
||||
HAIKU_FREETYPE_URL = $(hpkgBaseURL)/$(HAIKU_FREETYPE_PACKAGE) ;
|
||||
HAIKU_FREETYPE_DEVEL_URL = $(hpkgBaseURL)/$(HAIKU_FREETYPE_DEVEL_PACKAGE) ;
|
||||
|
||||
HAIKU_FREETYPE_DIR = [ FDirName $(HAIKU_OPTIONAL_BUILD_PACKAGES_DIR)
|
||||
$(HAIKU_FREETYPE_FILE:B) ] ;
|
||||
|
||||
HAIKU_FREETYPE_HEADERS_DEPENDENCY = [ ExtractArchive $(HAIKU_FREETYPE_DIR)
|
||||
: develop/headers/3rdparty/freetype2 : $(freetypeZipFile)
|
||||
: extracted-freetype ] ;
|
||||
|
||||
HAIKU_FREETYPE_LIB = [ ExtractArchive $(HAIKU_FREETYPE_DIR)
|
||||
:
|
||||
common/lib/libfreetype.so
|
||||
: $(freetypeZipFile)
|
||||
: extracted-freetype ] ;
|
||||
HAIKU_FREETYPE_CURRENT_LIB = [ ExtractArchive $(HAIKU_FREETYPE_DIR)
|
||||
:
|
||||
common/lib/libfreetype.so.6.8.1
|
||||
: $(freetypeZipFile)
|
||||
: extracted-freetype ] ;
|
||||
Depends $(HAIKU_FREETYPE_LIB) $(HAIKU_FREETYPE_CURRENT_LIB) : $(HAIKU_FREETYPE_HEADERS_DEPENDENCY) ;
|
||||
|
||||
HAIKU_FREETYPE_CURRENT_LINK = libfreetype.so.6 ;
|
||||
|
||||
HAIKU_FREETYPE_HEADERS = [ FDirName $(HAIKU_FREETYPE_DIR) develop
|
||||
headers 3rdparty ] [ FDirName $(HAIKU_FREETYPE_DIR) develop
|
||||
headers 3rdparty freetype2 ] ;
|
||||
ExtractBuildFeatureArchives freetype :
|
||||
file: base $(HAIKU_FREETYPE_URL)
|
||||
runtime: lib
|
||||
file: devel $(HAIKU_FREETYPE_DEVEL_URL)
|
||||
depends: base
|
||||
library: develop/lib/libfreetype.so
|
||||
headers: develop/headers develop/headers/freetype2
|
||||
;
|
||||
|
||||
EnableBuildFeatures freetype ;
|
||||
} else {
|
||||
|
@ -78,7 +78,6 @@ SYSTEM_LIBS = [ FFilterByBuildFeatures
|
||||
PRIVATE_SYSTEM_LIBS = [ FFilterByBuildFeatures
|
||||
$(HAIKU_JPEG_CURRENT_LIB)
|
||||
$(HAIKU_LIBPNG_CURRENT_LIB)
|
||||
$(HAIKU_FREETYPE_CURRENT_LIB)
|
||||
libalm.so
|
||||
libfluidsynth.so
|
||||
libilmimf.so
|
||||
|
@ -12,7 +12,7 @@ OptionalPackageDependencies CDRecord : GetTextLibintl LibIconv ;
|
||||
OptionalPackageDependencies Curl : OpenSSL ;
|
||||
OptionalPackageDependencies DevelopmentBase : CDRecord DevelopmentMin Yasm ;
|
||||
OptionalPackageDependencies Development
|
||||
: DevelopmentBase FFMpeg-devel GLU-devel Perl Zlib-devel ;
|
||||
: DevelopmentBase FFMpeg-devel FreeType-devel GLU-devel Perl Zlib-devel ;
|
||||
OptionalPackageDependencies DevelopmentPowerPC : DevelopmentMin ;
|
||||
OptionalPackageDependencies GetText : GetTextLibintl ;
|
||||
OptionalPackageDependencies GetTextLibintl : LibIconv ;
|
||||
@ -46,4 +46,4 @@ OptionalPackageDependencies XZ-Utils : Tar ;
|
||||
OptionalPackageDependencies Zlib-devel : Zlib ;
|
||||
|
||||
OptionalPackageDependencies MandatoryPackages
|
||||
: Bzip Ctags FFMpeg GLU Grep ICU LibSolv Mesa Sed Tar Zlib ;
|
||||
: Bzip Ctags FFMpeg FreeType GLU Grep ICU LibSolv Mesa Sed Tar Zlib ;
|
||||
|
@ -46,6 +46,8 @@
|
||||
# Fastdep - fast dependency generator for C/C++ files
|
||||
# FFMpeg - audio/video library
|
||||
# FFMpeg-devel - FFMpeg development files
|
||||
# FreeType - A Free, High-Quality, and Portable Font Engine
|
||||
# FreeType-devel - FreeType development files
|
||||
# friss - RSS/ATOM/... feeds reader
|
||||
# GetText - a framework to help produce multi-lingual messages.
|
||||
# GetTextLibintl - GetText's libintl
|
||||
@ -888,6 +890,26 @@ if [ IsOptionalHaikuImagePackageAdded FFMpeg-devel ] {
|
||||
}
|
||||
|
||||
|
||||
# FreeType
|
||||
if [ IsOptionalHaikuImagePackageAdded FreeType ] {
|
||||
if $(TARGET_ARCH) in arm ppc x86 x86_64 {
|
||||
InstallOptionalHaikuImagePackage $(HAIKU_FREETYPE_URL) : system ;
|
||||
} else {
|
||||
Echo "No optional package FreeType available for $(TARGET_ARCH)" ;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
# FreeType-devel
|
||||
if [ IsOptionalHaikuImagePackageAdded FreeType-devel ] {
|
||||
if $(TARGET_ARCH) in arm ppc x86 x86_64 {
|
||||
InstallOptionalHaikuImagePackage $(HAIKU_FREETYPE_DEVEL_URL) : system ;
|
||||
} else {
|
||||
Echo "No optional package FreeType-devel available for $(TARGET_ARCH)" ;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
# friss
|
||||
if [ IsOptionalHaikuImagePackageAdded friss ] {
|
||||
if $(TARGET_ARCH) != x86 {
|
||||
|
@ -103,7 +103,6 @@ SYSTEM_LIBS_ALIASES =
|
||||
;
|
||||
|
||||
OPTIONAL_LIBS_ALIASES =
|
||||
libfreetype.so
|
||||
libjpeg.so
|
||||
libpng.so
|
||||
libz.so
|
||||
@ -111,12 +110,6 @@ OPTIONAL_LIBS_ALIASES =
|
||||
|
||||
# TODO: Remove the following symlinks when the libraries have been packaged
|
||||
# properly!
|
||||
# libfreetype.so links to the current freetype lib
|
||||
AddSymlinkToPackage lib : $(HAIKU_FREETYPE_CURRENT_LIB:BS)
|
||||
: $(HAIKU_FREETYPE_CURRENT_LINK) : : true ;
|
||||
AddSymlinkToPackage lib : $(HAIKU_FREETYPE_CURRENT_LINK)
|
||||
: libfreetype.so : : true ;
|
||||
|
||||
# libpng.so links to the current libpng
|
||||
AddSymlinkToPackage lib : $(HAIKU_LIBPNG_CURRENT_LIB:BS)
|
||||
: $(HAIKU_LIBPNG_CURRENT_LINK) : : true ;
|
||||
|
@ -40,8 +40,8 @@ AddFilesToPackage $(developDirTokens) lib : libposix_error_mapper.a ;
|
||||
|
||||
# ABI independent stuff
|
||||
|
||||
# scripts: freetype-config, setgcc
|
||||
local scripts = freetype-config setgcc ;
|
||||
# scripts: setgcc
|
||||
local scripts = setgcc ;
|
||||
SEARCH on $(scripts) = [ FDirName $(HAIKU_TOP) data bin ] ;
|
||||
AddFilesToPackage bin : $(scripts) ;
|
||||
|
||||
@ -71,9 +71,6 @@ AddHeaderDirectoryToPackage compatibility gnu : gnu ;
|
||||
AddHeaderDirectoryToPackage libs termcap : 3rdparty ;
|
||||
AddHeaderDirectoryToPackage libs tiff : 3rdparty ;
|
||||
|
||||
CopyDirectoryToPackage develop headers 3rdparty
|
||||
: $(HAIKU_FREETYPE_HEADERS_DEPENDENCY)
|
||||
: freetype2 : : isTarget ;
|
||||
CopyDirectoryToPackage develop headers : $(HAIKU_JPEG_HEADERS_DEPENDENCY)
|
||||
: 3rdparty : : isTarget ;
|
||||
CopyDirectoryToPackage develop headers : $(HAIKU_LIBPNG_HEADERS_DEPENDENCY)
|
||||
|
@ -1,160 +0,0 @@
|
||||
#! /bin/sh
|
||||
#
|
||||
# Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009 by
|
||||
# David Turner, Robert Wilhelm, and Werner Lemberg.
|
||||
#
|
||||
# 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.
|
||||
|
||||
prefix=/boot/common
|
||||
exec_prefix=${prefix}
|
||||
exec_prefix_set=no
|
||||
includedir=/boot/develop/headers/3rdparty
|
||||
libdir=${exec_prefix}/lib
|
||||
enable_shared=
|
||||
wl=-Wl,
|
||||
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
|
||||
|
||||
usage()
|
||||
{
|
||||
cat <<EOF
|
||||
Usage: freetype-config [OPTION]...
|
||||
Get FreeType compilation and linking information.
|
||||
|
||||
Options:
|
||||
--prefix display \`--prefix' value used for building the
|
||||
FreeType library
|
||||
--prefix=PREFIX override \`--prefix' value with PREFIX
|
||||
--exec-prefix display \`--exec-prefix' value used for building
|
||||
the FreeType library
|
||||
--exec-prefix=EPREFIX override \`--exec-prefix' value with EPREFIX
|
||||
--version display libtool version of the FreeType library
|
||||
--ftversion display FreeType version number
|
||||
--libs display flags for linking with the FreeType library
|
||||
--libtool display library name for linking with libtool
|
||||
--cflags display flags for compiling with the FreeType
|
||||
library
|
||||
EOF
|
||||
exit $1
|
||||
}
|
||||
|
||||
if test $# -eq 0 ; then
|
||||
usage 1 1>&2
|
||||
fi
|
||||
|
||||
while test $# -gt 0 ; do
|
||||
case "$1" in
|
||||
-*=*)
|
||||
optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'`
|
||||
;;
|
||||
*)
|
||||
optarg=
|
||||
;;
|
||||
esac
|
||||
|
||||
case $1 in
|
||||
--prefix=*)
|
||||
prefix=$optarg
|
||||
local_prefix=yes
|
||||
;;
|
||||
--prefix)
|
||||
echo_prefix=yes
|
||||
;;
|
||||
--exec-prefix=*)
|
||||
exec_prefix=$optarg
|
||||
exec_prefix_set=yes
|
||||
local_prefix=yes
|
||||
;;
|
||||
--exec-prefix)
|
||||
echo_exec_prefix=yes
|
||||
;;
|
||||
--version)
|
||||
echo 9.20.3
|
||||
exit 0
|
||||
;;
|
||||
--ftversion)
|
||||
echo_ft_version=yes
|
||||
;;
|
||||
--cflags)
|
||||
echo_cflags=yes
|
||||
;;
|
||||
--libs)
|
||||
echo_libs=yes
|
||||
;;
|
||||
--libtool)
|
||||
echo_libtool=yes
|
||||
;;
|
||||
*)
|
||||
usage 1 1>&2
|
||||
;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
|
||||
if test "$local_prefix" = "yes" ; then
|
||||
if test "$exec_prefix_set" != "yes" ; then
|
||||
exec_prefix=$prefix
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$echo_prefix" = "yes" ; then
|
||||
echo $prefix
|
||||
fi
|
||||
|
||||
if test "$echo_exec_prefix" = "yes" ; then
|
||||
echo $exec_prefix
|
||||
fi
|
||||
|
||||
if test "$exec_prefix_set" = "yes" ; then
|
||||
libdir=$exec_prefix/lib
|
||||
else
|
||||
if test "$local_prefix" = "yes" ; then
|
||||
includedir=$prefix/include
|
||||
libdir=$prefix/lib
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$echo_ft_version" = "yes" ; then
|
||||
major=`grep define $includedir/freetype/freetype.h \
|
||||
| grep FREETYPE_MAJOR \
|
||||
| sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'`
|
||||
minor=`grep define $includedir/freetype/freetype.h \
|
||||
| grep FREETYPE_MINOR \
|
||||
| sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'`
|
||||
patch=`grep define $includedir/freetype/freetype.h \
|
||||
| grep FREETYPE_PATCH \
|
||||
| sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'`
|
||||
echo $major.$minor.$patch
|
||||
fi
|
||||
|
||||
if test "$echo_cflags" = "yes" ; then
|
||||
cflags="-I$includedir/freetype2"
|
||||
if test "$includedir" != "/usr/include" ; then
|
||||
echo $cflags -I$includedir
|
||||
else
|
||||
echo $cflags
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$echo_libs" = "yes" ; then
|
||||
rpath=
|
||||
if test "$enable_shared" = "yes" ; then
|
||||
eval "rpath=\"$hardcode_libdir_flag_spec\""
|
||||
fi
|
||||
libs="-lfreetype -lz "
|
||||
if test "$libdir" != "/usr/lib" && test "$libdir" != "/usr/lib64"; then
|
||||
echo -L$libdir $rpath $libs
|
||||
else
|
||||
echo $libs
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$echo_libtool" = "yes" ; then
|
||||
convlib="libfreetype.la"
|
||||
echo $libdir/$convlib
|
||||
fi
|
||||
|
||||
# EOF
|
@ -1,6 +1,6 @@
|
||||
SubDir HAIKU_TOP src add-ons decorators BeDecorator ;
|
||||
|
||||
UseHeaders $(HAIKU_FREETYPE_HEADERS) : true ;
|
||||
UseBuildFeatureHeaders freetype ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src servers app ] ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing ] ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter ] ;
|
||||
@ -10,9 +10,8 @@ UsePrivateHeaders kernel ;
|
||||
|
||||
AddResources ClassicBe : resources.rdef ;
|
||||
|
||||
#TODO: See #8716, hrev44313 for ft2build.h: No such file or directory
|
||||
#Includes [ FGristFiles BeDecorator.cpp ]
|
||||
# : $(HAIKU_FREETYPE_HEADERS_DEPENDENCY) ;
|
||||
Includes [ FGristFiles BeDecorator.cpp ]
|
||||
: [ BuildFeatureAttribute freetype : headers ] ;
|
||||
|
||||
Addon ClassicBe :
|
||||
BeDecorator.cpp
|
||||
|
@ -1,6 +1,6 @@
|
||||
SubDir HAIKU_TOP src add-ons decorators MacDecorator ;
|
||||
|
||||
UseHeaders $(HAIKU_FREETYPE_HEADERS) : true ;
|
||||
UseBuildFeatureHeaders freetype ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src servers app ] ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src servers app decorator ] ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing ] ;
|
||||
@ -13,7 +13,7 @@ UsePrivateHeaders kernel ;
|
||||
AddResources MacDecorator : resources.rdef ;
|
||||
|
||||
Includes [ FGristFiles MacDecorator.cpp ]
|
||||
: $(HAIKU_FREETYPE_HEADERS_DEPENDENCY) ;
|
||||
: [ BuildFeatureAttribute freetype : headers ] ;
|
||||
|
||||
Addon MacDecorator :
|
||||
MacDecorator.cpp
|
||||
|
@ -1,6 +1,6 @@
|
||||
SubDir HAIKU_TOP src add-ons decorators WinDecorator ;
|
||||
|
||||
UseHeaders $(HAIKU_FREETYPE_HEADERS) : true ;
|
||||
UseBuildFeatureHeaders freetype ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src servers app ] ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing ] ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter ] ;
|
||||
@ -10,9 +10,8 @@ UsePrivateHeaders kernel ;
|
||||
|
||||
AddResources WinDecorator : resources.rdef ;
|
||||
|
||||
#TODO: See #8716, hrev44313 for ft2build.h: No such file or directory
|
||||
#Includes [ FGristFiles WinDecorator.cpp ]
|
||||
# : $(HAIKU_FREETYPE_HEADERS_DEPENDENCY) ;
|
||||
Includes [ FGristFiles WinDecorator.cpp ]
|
||||
: [ BuildFeatureAttribute freetype : headers ] ;
|
||||
|
||||
Addon WinDecorator :
|
||||
WinDecorator.cpp
|
||||
|
@ -1,10 +1,10 @@
|
||||
SubDir HAIKU_TOP src preferences appearance ;
|
||||
|
||||
UsePrivateHeaders app interface [ FDirName servers app ] ;
|
||||
UseHeaders $(HAIKU_FREETYPE_HEADERS) : true ;
|
||||
UseBuildFeatureHeaders freetype ;
|
||||
|
||||
Includes [ FGristFiles AntialiasingSettingsView.cpp ]
|
||||
: $(HAIKU_FREETYPE_HEADERS_DEPENDENCY) ;
|
||||
: [ BuildFeatureAttribute freetype : headers ] ;
|
||||
|
||||
Preference Appearance :
|
||||
APRMain.cpp
|
||||
|
@ -30,13 +30,13 @@ local font_src =
|
||||
FontStyle.cpp
|
||||
;
|
||||
|
||||
UseHeaders $(HAIKU_FREETYPE_HEADERS) : true ;
|
||||
UseBuildFeatureHeaders freetype ;
|
||||
Includes [ FGristFiles AppServer.cpp BitmapManager.cpp
|
||||
ClientMemoryAllocator.cpp Desktop.cpp DesktopSettings.cpp DrawState.cpp
|
||||
ServerApp.cpp ServerBitmap.cpp ServerFont.cpp ServerPicture.cpp
|
||||
ServerWindow.cpp View.cpp Window.cpp WorkspacesView.cpp
|
||||
$(decorator_src) $(font_src) ]
|
||||
: $(HAIKU_FREETYPE_HEADERS_DEPENDENCY) ;
|
||||
: [ BuildFeatureAttribute freetype : headers ] ;
|
||||
|
||||
|
||||
local BROKEN_64 = ;
|
||||
@ -96,7 +96,8 @@ Server app_server :
|
||||
:
|
||||
libtranslation.so libbe.so libbnetapi.so
|
||||
libaslocal.a $(BROKEN_64)libasremote.a $(BROKEN_64)libashtml5.a
|
||||
libasdrawing.a libpainter.a libagg.a $(HAIKU_FREETYPE_LIB)
|
||||
libasdrawing.a libpainter.a libagg.a
|
||||
[ BuildFeatureAttribute freetype : library ]
|
||||
libstackandtile.a liblinprog.a libtextencoding.so libshared.a
|
||||
$(TARGET_LIBSTDC++)
|
||||
|
||||
|
@ -10,10 +10,10 @@ UseHeaders [ FDirName $(HAIKU_TOP) src servers app font ] ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter ] ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter drawing_modes ] ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter font_support ] ;
|
||||
UseHeaders $(HAIKU_FREETYPE_HEADERS) : true ;
|
||||
UseBuildFeatureHeaders freetype ;
|
||||
|
||||
Includes [ FGristFiles DrawingEngine.cpp ]
|
||||
: $(HAIKU_FREETYPE_HEADERS_DEPENDENCY) ;
|
||||
: [ BuildFeatureAttribute freetype : headers ] ;
|
||||
|
||||
StaticLibrary libasdrawing.a :
|
||||
BitmapBuffer.cpp
|
||||
|
@ -9,7 +9,7 @@ UseHeaders [ FDirName $(HAIKU_TOP) src servers app ] ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src servers app font ] ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing ] ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter drawing_modes ] ;
|
||||
UseHeaders $(HAIKU_FREETYPE_HEADERS) : true ;
|
||||
UseBuildFeatureHeaders freetype ;
|
||||
|
||||
SEARCH_SOURCE += [ FDirName $(SUBDIR) drawing_modes ] ;
|
||||
|
||||
@ -19,7 +19,7 @@ if $(TARGET_ARCH) = x86 {
|
||||
}
|
||||
|
||||
Includes [ FGristFiles AGGTextRenderer.cpp Painter.cpp ]
|
||||
: $(HAIKU_FREETYPE_HEADERS_DEPENDENCY) ;
|
||||
: [ BuildFeatureAttribute freetype : headers ] ;
|
||||
|
||||
StaticLibrary libpainter.a :
|
||||
GlobalSubpixelSettings.cpp
|
||||
|
@ -11,10 +11,11 @@ UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing ] ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter ] ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter drawing_modes ] ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter font_support ] ;
|
||||
UseHeaders $(HAIKU_FREETYPE_HEADERS) : true ;
|
||||
UseBuildFeatureHeaders freetype ;
|
||||
|
||||
Includes [ FGristFiles HTML5HWInterface.cpp HTML5DrawingEngine.cpp CanvasMessage.cpp ]
|
||||
: $(HAIKU_FREETYPE_HEADERS_DEPENDENCY) ;
|
||||
Includes [ FGristFiles HTML5HWInterface.cpp HTML5DrawingEngine.cpp
|
||||
CanvasMessage.cpp ]
|
||||
: [ BuildFeatureAttribute freetype : headers ] ;
|
||||
|
||||
StaticLibrary libashtml5.a :
|
||||
base64.cpp
|
||||
|
@ -11,11 +11,11 @@ UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing ] ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter ] ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter drawing_modes ] ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter font_support ] ;
|
||||
UseHeaders $(HAIKU_FREETYPE_HEADERS) : true ;
|
||||
UseBuildFeatureHeaders freetype ;
|
||||
|
||||
Includes [ FGristFiles RemoteDrawingEngine.cpp RemoteMessage.cpp
|
||||
RemoteHWInterface.cpp ]
|
||||
: $(HAIKU_FREETYPE_HEADERS_DEPENDENCY) ;
|
||||
RemoteHWInterface.cpp ]
|
||||
: [ BuildFeatureAttribute freetype : headers ] ;
|
||||
|
||||
StaticLibrary libasremote.a :
|
||||
NetReceiver.cpp
|
||||
|
@ -2,13 +2,13 @@ SubDir HAIKU_TOP src servers app stackandtile ;
|
||||
|
||||
UseLibraryHeaders agg lp_solve linprog ;
|
||||
UsePrivateHeaders app graphics interface shared kernel ;
|
||||
UseBuildFeatureHeaders freetype ;
|
||||
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src servers app ] ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src servers app decorator ] ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src servers app font ] ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing ] ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter ] ;
|
||||
UseHeaders $(HAIKU_FREETYPE_HEADERS) : true ;
|
||||
|
||||
local sources =
|
||||
SATDecorator.cpp
|
||||
@ -19,7 +19,7 @@ local sources =
|
||||
Tiling.cpp ;
|
||||
|
||||
Includes [ FGristFiles $(sources) ]
|
||||
: $(HAIKU_FREETYPE_HEADERS_DEPENDENCY) ;
|
||||
: [ BuildFeatureAttribute freetype : headers ] ;
|
||||
|
||||
StaticLibrary libstackandtile.a :
|
||||
$(sources)
|
||||
|
@ -8,7 +8,7 @@ UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing ] ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter ] ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter drawing_modes ] ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter font_support ] ;
|
||||
UseHeaders $(HAIKU_FREETYPE_HEADERS) : true ;
|
||||
UseBuildFeatureHeaders freetype ;
|
||||
|
||||
Server fake_app_server :
|
||||
AppServer.cpp
|
||||
|
@ -30,7 +30,7 @@ UseHeaders [ FDirName $(appServerDir) drawing Painter drawing_modes ] ;
|
||||
UseHeaders [ FDirName $(appServerDir) drawing Painter font_support ] ;
|
||||
UseHeaders [ FDirName $(appServerDir) font ] ;
|
||||
UseHeaders [ FDirName $(appServerDir) stackandtile ] ;
|
||||
UseHeaders $(HAIKU_FREETYPE_HEADERS) : true ;
|
||||
UseBuildFeatureHeaders freetype ;
|
||||
UseLibraryHeaders agg lp_solve linprog ;
|
||||
|
||||
# This overrides the definitions in private/servers/app/ServerConfig.h
|
||||
|
@ -7,7 +7,7 @@ UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing ] ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter ] ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter drawing_modes ] ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter font_support ] ;
|
||||
UseHeaders $(HAIKU_FREETYPE_HEADERS) : true ;
|
||||
UseBuildFeatureHeaders freetype ;
|
||||
|
||||
SimpleTest Painter :
|
||||
BitmapBuffer.cpp
|
||||
|
Loading…
Reference in New Issue
Block a user