diff --git a/Jamrules b/Jamrules index 60fb1d5f18..090acc7050 100644 --- a/Jamrules +++ b/Jamrules @@ -42,7 +42,6 @@ include [ FDirName $(HAIKU_BUILD_RULES_DIR) CommandLineArguments ] ; include [ FDirName $(HAIKU_BUILD_RULES_DIR) ConfigRules ] ; include [ FDirName $(HAIKU_BUILD_RULES_DIR) DocumentationRules ] ; include [ FDirName $(HAIKU_BUILD_RULES_DIR) FileRules ] ; -include [ FDirName $(HAIKU_BUILD_RULES_DIR) FreetypeRules ] ; include [ FDirName $(HAIKU_BUILD_RULES_DIR) HeadersRules ] ; include [ FDirName $(HAIKU_BUILD_RULES_DIR) KernelRules ] ; include [ FDirName $(HAIKU_BUILD_RULES_DIR) ImageRules ] ; diff --git a/build/jam/FreetypeRules b/build/jam/FreetypeRules deleted file mode 100644 index fcee016945..0000000000 --- a/build/jam/FreetypeRules +++ /dev/null @@ -1,85 +0,0 @@ -#------------------------------------------------------------------------------- -# FreeType 2 specific rules and variables -#------------------------------------------------------------------------------- - -FT2_INCLUDE = [ FDirName $(HAIKU_TOP) headers libs freetype2 ] ; -FT2_SRC = [ FDirName $(HAIKU_TOP) src libs freetype2 ] ; - -FT2_LIB = freetype ; - -FT2_COMPONENTS ?= gzip # support for gzip-compressed files. - autofit - base # base component (public APIs) - bdf # BDF font driver - cache # cache sub-system - cff # CFF/CEF font driver - cid # Postscript CID-keyed font driver - lzw # LZW routines - pcf # PCF font driver - pfr # PFR/TrueDoc font driver - psaux # Common Postscript routines module - pshinter # Postscript hinter module - psnames # Postscript names handling - raster # Monochrome rasterizer - smooth # Anti-aliased rasterizer - sfnt # SFNT-based format support routines - truetype # TrueType font driver - type1 # Postscript Type 1 font driver - type42 # Postscript Type 42 (embedded TrueType) driver - winfonts # Windows FON/FNT font driver - ; - -rule UseFreeTypeHeaders -{ - SubDirSysHdrs $(FT2_INCLUDE) ; -} - -rule UseFreeTypeObjectHeaders -{ - # UseFreeTypeObjectHeaders [ : ] ; - SourceSysHdrs $(1) : $(FT2_INCLUDE) : $(2) ; -} - -rule FT2_SubDir -{ - # FT2_SubDir - # : Components of a directory in the original hierarchy. - local dir = $(1) ; - local topDir ; - switch $(dir[1]) - { - case "include" : topDir = $(FT2_INCLUDE) ; - case src : topDir = $(FT2_SRC) ; - case * : ECHO "Unknown FreeType2 directory: " $(dir) ; - } - return [ FDirName $(topDir) $(dir[2-]) ] ; -} - -rule FT2_Library -{ - # FT2_Library : - # Builds objects from sources and adds the objects to the list of objects - # to be linked into the library. - # The name of the library. - # The sources. - - DEFINES += FT2_BUILD_LIBRARY ; - - local library = lib$(1).so ; - local sources = $(2) ; - - Objects $(sources) ; - LIBRARY_OBJECTS on $(library) += [ FGristFiles $(sources:S=$(SUFOBJ)) ] ; -} - -rule FT2_LinkLibrary -{ - # FT2_LinkLibrary - # Links the library from the objects build with FT2_LIBRARY before. - - local library = lib$(1).so ; - local objects = [ on $(library) return $(LIBRARY_OBJECTS) ] ; - ObjectReferences $(objects) ; - objects = [ FGristFiles $(objects) ] ; - SharedLibraryFromObjects $(library) : $(objects) ; -} diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages index d9f5ec739f..c4220bdba2 100644 --- a/build/jam/OptionalPackages +++ b/build/jam/OptionalPackages @@ -785,7 +785,6 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentMin ] && $(TARGET_ARCH) = x86 { AddHeaderDirectoryToHaikuImage compatibility gnu : gnu ; # third party libs headers - AddHeaderDirectoryToHaikuImage libs freetype2 : 3rdparty ; AddHeaderDirectoryToHaikuImage libs jpeg : 3rdparty ; AddHeaderDirectoryToHaikuImage libs ncurses : 3rdparty ; AddHeaderDirectoryToHaikuImage libs png : 3rdparty ;