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

Bug 612234 Part 1: Define MOZ_TREE_PIXMAN when using internal pixman r=jmuizelaar a=blocking-2.0

Browse Source
This commit is contained in:
Ginn Chen 2010-11-30 14:38:02 +08:00
parent 0cda5059a7
commit 72a40ae401
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/Makefile.in
View File

@ -125,6 +125,7 @@ export::
$(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) \
-DBUILD_STATIC_LIBS=$(BUILD_STATIC_LIBS) \
-DMOZ_TREE_CAIRO=$(MOZ_TREE_CAIRO) \
-DMOZ_TREE_PIXMAN=$(MOZ_TREE_PIXMAN) \
-DMOZ_ENABLE_LIBXUL=$(MOZ_ENABLE_LIBXUL) \
-DMOZ_NATIVE_HUNSPELL=$(MOZ_NATIVE_HUNSPELL) \
-DMOZ_NATIVE_BZ2=$(MOZ_NATIVE_BZ2) \

1
configure.in
View File

@ -8598,6 +8598,7 @@ if test "$MOZ_TREE_CAIRO"; then
MOZ_CAIRO_LIBS='$(call EXPAND_LIBNAME_PATH,mozcairo,$(DEPTH)/gfx/cairo/cairo/src)'" $CAIRO_FT_LIBS"
if test "$MOZ_TREE_PIXMAN"; then
AC_DEFINE(MOZ_TREE_PIXMAN)
MOZ_CAIRO_LIBS="$MOZ_CAIRO_LIBS"' $(call EXPAND_LIBNAME_PATH,mozlibpixman,$(DEPTH)/gfx/cairo/libpixman/src)'
else
PKG_CHECK_MODULES(PIXMAN, pixman-1 >= 0.19.2)

2
gfx/cairo/cairo/src/Makefile.in
View File

@ -266,6 +266,8 @@ endif
ifndef MOZ_TREE_PIXMAN
CFLAGS += $(MOZ_CAIRO_CFLAGS)
CXXFLAGS += $(MOZ_CAIRO_CFLAGS)
else
DEFINES += -DMOZ_TREE_PIXMAN
endif
cairo-features.h: $(srcdir)/cairo-features.h.in $(GLOBAL_DEPS)