mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 1012447: allow building webapprt against gtk3 r=glandium
This commit is contained in:
parent
cf95133245
commit
cac76de7bf
@ -6280,7 +6280,7 @@ MOZ_ARG_DISABLE_BOOL(webapp-runtime,
|
||||
[ --disable-webapp-runtime Disable Web App Runtime],
|
||||
MOZ_WEBAPP_RUNTIME=,
|
||||
MOZ_WEBAPP_RUNTIME=1)
|
||||
if test "$MOZ_WIDGET_TOOLKIT" != "windows" -a "$MOZ_WIDGET_TOOLKIT" != "cocoa" -a "$MOZ_WIDGET_TOOLKIT" != "gtk2"; then
|
||||
if test "$MOZ_WIDGET_TOOLKIT" != "windows" -a "$MOZ_WIDGET_TOOLKIT" != "cocoa" -a -z "$MOZ_WIDGET_GTK" ; then
|
||||
MOZ_WEBAPP_RUNTIME=
|
||||
fi
|
||||
if test "$OS_ARCH" = "WINNT" -a -z "$MAKENSISU" -a -n "$CROSS_COMPILE"; then
|
||||
|
@ -4,7 +4,7 @@
|
||||
|
||||
LIBS = \
|
||||
$(XPCOM_STANDALONE_GLUE_LDOPTS) \
|
||||
$(MOZ_GTK2_LIBS) \
|
||||
$(TK_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
NSDISTMODE = copy
|
||||
@ -14,7 +14,7 @@ PROGRAMS_DEST = $(DIST)/bin
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
CXXFLAGS += \
|
||||
$(MOZ_GTK2_CFLAGS) \
|
||||
$(TK_CFLAGS) \
|
||||
$(NULL)
|
||||
|
||||
GRE_BUILDID := $(shell cat $(DEPTH)/config/buildid)
|
||||
|
@ -8,7 +8,7 @@ if CONFIG['OS_ARCH'] == 'WINNT':
|
||||
DIRS += ['win']
|
||||
elif CONFIG['OS_ARCH'] == 'Darwin':
|
||||
DIRS += ['mac']
|
||||
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2':
|
||||
elif CONFIG['MOZ_ENABLE_GTK']:
|
||||
DIRS += ['gtk']
|
||||
|
||||
DIRS += ['locales']
|
||||
|
Loading…
Reference in New Issue
Block a user