зеркало из https://github.com/mozilla/gecko-dev.git
Fixed the breakage caused by MOZ_GTK_CFLAGS not being defined in INCLUDES.
This commit is contained in:
Родитель
224bb8c6d0
Коммит
2e989c6f6c
|
@ -29,22 +29,22 @@ REQUIRES = xpcom
|
||||||
CPPSRCS = nsTimerGtk.cpp
|
CPPSRCS = nsTimerGtk.cpp
|
||||||
|
|
||||||
ifndef MOZ_MONOLITHIC_TOOLKIT
|
ifndef MOZ_MONOLITHIC_TOOLKIT
|
||||||
|
|
||||||
TIMER_SUFFIX = gtk
|
TIMER_SUFFIX = gtk
|
||||||
IS_COMPONENT = 1
|
IS_COMPONENT = 1
|
||||||
CPPSRCS += nsTimerGtkFactory.cpp
|
CPPSRCS += nsTimerGtkFactory.cpp
|
||||||
INCLUDES += $(MOZ_GTK_CFLAGS) -I$(srcdir)/..
|
|
||||||
EXTRA_DSO_LDOPTS = $(MOZ_GTK_LDFLAGS)
|
EXTRA_DSO_LDOPTS = $(MOZ_GTK_LDFLAGS)
|
||||||
|
|
||||||
else
|
else
|
||||||
|
|
||||||
TIMER_SUFFIX = s
|
TIMER_SUFFIX = s
|
||||||
CXXFLAGS += $(TK_CFLAGS)
|
|
||||||
INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..
|
|
||||||
override NO_SHARED_LIB=1
|
override NO_SHARED_LIB=1
|
||||||
override NO_STATIC_LIB=
|
override NO_STATIC_LIB=
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
include $(topsrcdir)/config/rules.mk
|
include $(topsrcdir)/config/rules.mk
|
||||||
|
|
||||||
|
ifndef MOZ_MONOLITHIC_TOOLKIT
|
||||||
|
INCLUDES += $(MOZ_GTK_CFLAGS) -I$(srcdir)/..
|
||||||
|
else
|
||||||
|
CXXFLAGS += $(TK_CFLAGS)
|
||||||
|
INCLUDES += $(TK_CFLAGS) -I$(srcdir)/..
|
||||||
|
endif
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче