зеркало из https://github.com/mozilla/gecko-dev.git
Backout Bug 188527.
This commit is contained in:
Родитель
f4842f1af8
Коммит
a0e9007d87
|
@ -54,9 +54,7 @@ endif
|
||||||
|
|
||||||
ifdef MOZ_ENABLE_GTK2
|
ifdef MOZ_ENABLE_GTK2
|
||||||
LIBS += \
|
LIBS += \
|
||||||
-lgtkembedmoz \
|
-lgtkembedmoz
|
||||||
$(XLIBS) \
|
|
||||||
$(NULL)
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
include $(topsrcdir)/config/config.mk
|
include $(topsrcdir)/config/config.mk
|
||||||
|
|
|
@ -141,7 +141,7 @@ endif #MOZ_ENABLE_GTK
|
||||||
ifdef MOZ_ENABLE_GTK2
|
ifdef MOZ_ENABLE_GTK2
|
||||||
CXXFLAGS += $(MOZ_GTK2_CFLAGS)
|
CXXFLAGS += $(MOZ_GTK2_CFLAGS)
|
||||||
CFLAGS += $(MOZ_GTK2_CFLAGS)
|
CFLAGS += $(MOZ_GTK2_CFLAGS)
|
||||||
EXTRA_DSO_LDOPTS += -lgtkxtbin $(XLDFLAGS) $(XT_LIBS) $(MOZ_GTK2_LIBS) $(XLIBS)
|
EXTRA_DSO_LDOPTS += -lgtkxtbin $(XLDFLAGS) $(XT_LIBS) $(MOZ_GTK2_LIBS)
|
||||||
endif #MOZ_ENABLE_GTK2
|
endif #MOZ_ENABLE_GTK2
|
||||||
|
|
||||||
ifdef MOZ_ENABLE_XLIB
|
ifdef MOZ_ENABLE_XLIB
|
||||||
|
|
|
@ -58,7 +58,7 @@ CFLAGS += $(MOZ_GTK_CFLAGS)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef MOZ_ENABLE_GTK2
|
ifdef MOZ_ENABLE_GTK2
|
||||||
EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS) $(XLDFLAGS) $(XLIBS)
|
EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIB ) $(XLDFLAGS)
|
||||||
CXXFLAGS += $(MOZ_GTK2_CFLAGS)
|
CXXFLAGS += $(MOZ_GTK2_CFLAGS)
|
||||||
CFLAGS += $(MOZ_GTK2_CFLAGS)
|
CFLAGS += $(MOZ_GTK2_CFLAGS)
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -78,7 +78,7 @@ CPPSRCS = \
|
||||||
nsMaiHyperlink.cpp \
|
nsMaiHyperlink.cpp \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS) $(XPCOM_LIBS) $(NSPR_LIBS)
|
EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS)
|
||||||
|
|
||||||
include $(topsrcdir)/config/rules.mk
|
include $(topsrcdir)/config/rules.mk
|
||||||
|
|
||||||
|
|
|
@ -33,7 +33,7 @@ ifdef MOZ_ENABLE_GTK2
|
||||||
CSRCS = \
|
CSRCS = \
|
||||||
gtk2xtbin.c \
|
gtk2xtbin.c \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS) $(XLDFLAGS) $(XT_LIBS) $(XLIBS)
|
EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS) $(XLDFLAGS) $(XT_LIBS)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef MOZ_ENABLE_GTK
|
ifdef MOZ_ENABLE_GTK
|
||||||
|
|
Загрузка…
Ссылка в новой задаче