wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 758845 - Enable Skia on B2G, r=gw280

Browse Source
This commit is contained in:
Peter Chang 2013-07-25 19:46:53 +08:00
parent dd1a6cad4b
commit c5597b87f2
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.in
View File

@ -8150,7 +8150,11 @@ if test "${OS_TARGET}" = "WINNT"; then
fi
fi
if test "${OS_TARGET}" = "WINNT" -o "${OS_ARCH}" = "Darwin" -o "${MOZ_WIDGET_TOOLKIT}" = "android" -o "${MOZ_WIDGET_TOOLKIT}" = "gtk2"; then
if test "${OS_TARGET}" = "WINNT" -o \
"${OS_ARCH}" = "Darwin" -o \
"${MOZ_WIDGET_TOOLKIT}" = "android" -o \
"${MOZ_WIDGET_TOOLKIT}" = "gonk" -o \
"${MOZ_WIDGET_TOOLKIT}" = "gtk2"; then
case "${target_cpu}" in
i*86*|x86_64|arm)
MOZ_ENABLE_SKIA=1

2
gfx/skia/Makefile.in
View File

@ -59,7 +59,7 @@ VPATH += \
$(srcdir)/src/sfnt \
$(NULL)
ifeq (android,$(MOZ_WIDGET_TOOLKIT))
ifeq ($(MOZ_WIDGET_TOOLKIT),$(findstring $(MOZ_WIDGET_TOOLKIT),android gonk))
OS_CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(CAIRO_FT_CFLAGS)
DEFINES += -DSK_FONTHOST_CAIRO_STANDALONE=0
endif

7
gfx/skia/moz.build
View File

@ -207,14 +207,9 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
'SkThreadUtils_pthread_linux.cpp',
'SkTime_Unix.cpp',
]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
CPP_SOURCES += [
'SkThread_pthread.cpp',
]
# Separate 'if' from above, since the else below applies to all != 'android'
# toolkits.
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk'):
EXPORTS.skia += [
'include/ports/SkTypeface_cairo.h',
]