зеркало из https://github.com/mozilla/gecko-dev.git
Bug 908523 - Build Skia on GTK3 widget. r=karlt,gps
This commit is contained in:
Родитель
843fa5a7c2
Коммит
83376321fe
|
@ -8121,7 +8121,8 @@ 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
|
||||
"${MOZ_WIDGET_TOOLKIT}" = "gtk2" -o \
|
||||
"${MOZ_WIDGET_TOOLKIT}" = "gtk3"; then
|
||||
case "${target_cpu}" in
|
||||
i*86*|x86_64|arm)
|
||||
MOZ_ENABLE_SKIA=1
|
||||
|
|
|
@ -62,7 +62,7 @@ OS_CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(CAIRO_FT_CFLAGS)
|
|||
DEFINES += -DSK_FONTHOST_CAIRO_STANDALONE=0
|
||||
endif
|
||||
|
||||
ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT))
|
||||
ifdef MOZ_WIDGET_GTK
|
||||
OS_CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PANGO_CFLAGS) $(CAIRO_FT_CFLAGS)
|
||||
endif
|
||||
|
||||
|
@ -73,7 +73,7 @@ DEFINES += -DSK_USE_POSIX_THREADS=1
|
|||
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
|
||||
endif
|
||||
|
||||
|
|
|
@ -171,7 +171,7 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
|
|||
'SkThreadUtils_win.cpp',
|
||||
'SkTime_win.cpp',
|
||||
]
|
||||
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2':
|
||||
elif CONFIG['MOZ_WIDGET_GTK']:
|
||||
EXPORTS.skia += [
|
||||
'include/ports/SkTypeface_cairo.h',
|
||||
]
|
||||
|
|
|
@ -75,6 +75,13 @@ LIBS += \
|
|||
$(NULL)
|
||||
endif
|
||||
|
||||
ifeq (gtk3,$(MOZ_WIDGET_TOOLKIT))
|
||||
LIBS += \
|
||||
$(MOZ_GTK3_LIBS) \
|
||||
$(FT2_LIBS) \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
ifeq (qt,$(MOZ_WIDGET_TOOLKIT))
|
||||
LIBS += \
|
||||
$(XLIBS) \
|
||||
|
|
Загрузка…
Ссылка в новой задаче