Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 06:11:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 449292 - part 2 - add harfbuzz library to the gfx build process. r=ted

Browse Source
This commit is contained in:
Jonathan Kew 2010-06-11 20:14:37 +01:00
parent a2c47371a3
commit 3fb2af29a1
4 changed files with 94 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/autoconf.mk.in
View File

@ -461,6 +461,8 @@ endif
QCMS_LIBS = @QCMS_LIBS@
MOZ_HARFBUZZ_LIBS = @MOZ_HARFBUZZ_LIBS@
MOZ_NATIVE_SQLITE = @MOZ_NATIVE_SQLITE@
SQLITE_CFLAGS = @SQLITE_CFLAGS@
SQLITE_LIBS = @SQLITE_LIBS@

7
configure.in
View File

@ -8404,12 +8404,19 @@ AC_SUBST(MOZ_TREE_CAIRO)
AC_SUBST(MOZ_CAIRO_CFLAGS)
AC_SUBST(MOZ_CAIRO_LIBS)
dnl ========================================================
dnl qcms
dnl ========================================================
QCMS_LIBS='$(DEPTH)/gfx/qcms/$(LIB_PREFIX)mozqcms.$(LIB_SUFFIX)'
AC_SUBST(QCMS_LIBS)
dnl ========================================================
dnl HarfBuzz
dnl ========================================================
MOZ_HARFBUZZ_LIBS='$(DEPTH)/gfx/harfbuzz/src/$(LIB_PREFIX)mozharfbuzz.$(LIB_SUFFIX)'
AC_SUBST(MOZ_HARFBUZZ_LIBS)
dnl ========================================================
dnl disable xul
dnl ========================================================

2
gfx/Makefile.in
View File

@ -56,7 +56,7 @@ ifndef BUILD_STATIC_LIBS
DIRS += ycbcr
endif
DIRS += public idl src qcms layers thebes src/thebes
DIRS += public idl src qcms layers harfbuzz/src thebes src/thebes
ifdef BUILD_STATIC_LIBS
DIRS += ycbcr

84
gfx/harfbuzz/src/Makefile.in Normal file
View File

@ -0,0 +1,84 @@
#
# Copyright (C) 2010 Mozilla Foundation
#
# This is used to integrate the HarfBuzz library with the Mozilla build.
#
# Permission is hereby granted, without written agreement and without
# license or royalty fees, to use, copy, modify, and distribute this
# software and its documentation for any purpose, provided that the
# above copyright notice and the following two paragraphs appear in
# all copies of this software.
#
# IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
# DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
# ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
# IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
# DAMAGE.
#
# THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
# BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
# FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS
# ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
# PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
#
# Mozilla author(s): Jonathan Kew
#
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
ifndef MOZ_ENABLE_LIBXUL
VISIBILITY_FLAGS =
endif
MODULE = harfbuzz
LIBRARY_NAME = mozharfbuzz
LIBXUL_LIBRARY = 1
CSRCS = \
hb-blob.c \
hb-language.c \
hb-ot-tag.c \
hb-unicode.c \
$(NULL)
CPPSRCS = \
hb-buffer.cc \
hb-font.cc \
hb-ot-shape.cc \
hb-ot-layout.cc \
hb-shape.cc \
$(NULL)
EXPORTS_NAMESPACES = harfbuzz
EXPORTS_harfbuzz = \
hb.h \
hb-blob.h \
hb-buffer.h \
hb-common.h \
hb-font.h \
hb-language.h \
hb-ot.h \
hb-ot-layout.h \
hb-ot-tag.h \
hb-ot-shape.h \
hb-shape.h \
hb-unicode.h \
$(NULL)
LOCAL_INCLUDES += -I$(srcdir)
FORCE_STATIC_LIB = 1
# This library is used by other shared libs in a static build
FORCE_USE_PIC = 1
include $(topsrcdir)/config/rules.mk
DEFINES += -DPACKAGE_VERSION="\"moz\""
DEFINES += -DPACKAGE_BUGREPORT="\"http://bugzilla.mozilla.org/\""