freetype: builds against the 2.4.6 optional package.
* added optional feature package for freetype 2.4.6 gcc4/gcc2 x86 and gcc4 ppc. * FT_CONFIG_OPTION_SUBPIXEL_RENDERING is disabled, --include-patented-code doesn't change this setting anymore. This would require different packages. * drop freetype sources and headers from the tree. * fix decorators, test app server and appearance to use feature package headers. * hybrid build untested.
This commit is contained in:
@@ -84,7 +84,6 @@ SYSTEM_DEMOS = BSnow Chart Clock Cortex FontDemo $(X86_ONLY)GLTeapot
|
||||
SYSTEM_LIBS =
|
||||
libbe.so libbsd.so libbnetapi.so
|
||||
libdebug.so libdevice.so
|
||||
libfreetype.so
|
||||
libgame.so $(X86_ONLY)libGL.so libgnu.so
|
||||
libjpeg.so
|
||||
liblocale.so
|
||||
@@ -96,6 +95,7 @@ SYSTEM_LIBS =
|
||||
libtextencoding.so libtiff.so libtracker.so libtranslation.so
|
||||
libz.so
|
||||
$(HAIKU_SHARED_LIBSTDC++) $(HAIKU_SHARED_LIBSUPC++)
|
||||
$(HAIKU_FREETYPE_CURRENT_LIB)
|
||||
;
|
||||
PRIVATE_SYSTEM_LIBS =
|
||||
libalm.so
|
||||
@@ -316,6 +316,12 @@ SYSTEM_LIBS_ALIASES =
|
||||
$(SYSTEM_LIBS_LIBGL_ALIASES)
|
||||
;
|
||||
|
||||
# libfreetype.so links to the current freetype lib
|
||||
AddSymlinkToHaikuHybridImage system lib : $(HAIKU_FREETYPE_CURRENT_LIB:BS)
|
||||
: $(HAIKU_FREETYPE_CURRENT_LINK) : : true ;
|
||||
AddSymlinkToHaikuHybridImage system lib : $(HAIKU_FREETYPE_CURRENT_LINK)
|
||||
: libfreetype.so : : true ;
|
||||
|
||||
# servers
|
||||
AddFilesToHaikuImage system servers : $(SYSTEM_SERVERS) ;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user