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 908523 - Build Skia on GTK3 widget. r=karlt,gps

Browse Source
This commit is contained in:
Makoto Kato 2013-08-28 20:14:47 +09:00
parent c84de5dc2c
commit eb9c8af10f
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.in
View File

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

4
gfx/skia/Makefile.in
View File

@ -62,7 +62,7 @@ OS_CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(CAIRO_FT_CFLAGS)
DEFINES += -DSK_FONTHOST_CAIRO_STANDALONE=0 DEFINES += -DSK_FONTHOST_CAIRO_STANDALONE=0
endif endif
ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT)) ifdef MOZ_WIDGET_GTK
OS_CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PANGO_CFLAGS) $(CAIRO_FT_CFLAGS) OS_CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PANGO_CFLAGS) $(CAIRO_FT_CFLAGS)
endif endif
@ -73,7 +73,7 @@ DEFINES += -DSK_USE_POSIX_THREADS=1
endif endif
endif endif
ifeq ($(MOZ_WIDGET_TOOLKIT),$(findstring $(MOZ_WIDGET_TOOLKIT),android gtk2 gonk cocoa)) ifeq ($(MOZ_WIDGET_TOOLKIT),$(findstring $(MOZ_WIDGET_TOOLKIT),android gtk2 gtk3 gonk cocoa))
DEFINES += -DSK_USE_POSIX_THREADS=1 DEFINES += -DSK_USE_POSIX_THREADS=1
endif endif

2
gfx/skia/moz.build
View File

@ -171,7 +171,7 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
'SkThreadUtils_win.cpp', 'SkThreadUtils_win.cpp',
'SkTime_win.cpp', 'SkTime_win.cpp',
] ]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2': elif CONFIG['MOZ_WIDGET_GTK']:
EXPORTS.skia += [ EXPORTS.skia += [
'include/ports/SkTypeface_cairo.h', 'include/ports/SkTypeface_cairo.h',
] ]

7
media/webrtc/signaling/test/Makefile.in
View File

@ -75,6 +75,13 @@ LIBS += \
$(NULL) $(NULL)
endif endif
ifeq (gtk3,$(MOZ_WIDGET_TOOLKIT))
LIBS += \
$(MOZ_GTK3_LIBS) \
$(FT2_LIBS) \
$(NULL)
endif
ifeq (qt,$(MOZ_WIDGET_TOOLKIT)) ifeq (qt,$(MOZ_WIDGET_TOOLKIT))
LIBS += \ LIBS += \
$(XLIBS) \ $(XLIBS) \