Bug 1027440 - Build test plugins when building with --enable-default-toolkit=cairo-gtk3. r=mshal

This commit is contained in:
Mike Hommey 2014-06-20 17:32:16 +09:00
parent df1f9d8adf
commit 5a73acd832
3 changed files with 3 additions and 3 deletions

View File

@ -128,6 +128,6 @@ TEST_DIRS += [
'imptests',
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'cocoa', 'windows', 'android', 'qt'):
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'cocoa', 'windows', 'android', 'qt'):
TEST_DIRS += ['plugins/test']

View File

@ -37,7 +37,7 @@ endif
include $(topsrcdir)/config/rules.mk
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
ifneq (,$(filter gtk2 gtk3,$(MOZ_WIDGET_TOOLKIT)))
CXXFLAGS += $(MOZ_GTK2_CFLAGS)
CFLAGS += $(MOZ_GTK2_CFLAGS)
EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS) $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS)

View File

@ -20,7 +20,7 @@ if toolkit == 'cocoa':
UNIFIED_SOURCES += [
relative_path + '/nptest_macosx.mm'
]
elif toolkit == 'gtk2':
elif toolkit in ('gtk2', 'gtk3'):
UNIFIED_SOURCES += [
relative_path + '/nptest_gtk2.cpp',
]