mozilla
/
mozilla-history
зеркало из https://github.com/mozilla/mozilla-history.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 412582: remove MOZ_ENABLE_CAIRO_GFX from the build system, r=ted.mielczarek, a=beltzner

This commit is contained in:
mozilla@weilbacher.org 2008-01-28 15:07:34 -08:00
Родитель feba3ff1a7
Коммит 9e9173c466
12 изменённых файлов: 116 добавлений и 201 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

7
browser/app/Makefile.in
Просмотреть файл

@ -130,10 +130,7 @@ LIBS += \
# Add explicit X11 dependency when building against X11 toolkits # Add explicit X11 dependency when building against X11 toolkits
ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT))) ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
LIBS += $(XLDFLAGS) $(XLIBS) LIBS += $(XLDFLAGS) $(XLIBS) $(ZLIB_LIBS)
ifdef MOZ_ENABLE_CAIRO_GFX
LIBS += $(ZLIB_LIBS)
endif
endif endif
ifdef MOZ_JPROF ifdef MOZ_JPROF
@ -182,12 +179,10 @@ endif
ifeq ($(OS_ARCH),WINNT) ifeq ($(OS_ARCH),WINNT)
OS_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool) OS_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool)
ifdef MOZ_ENABLE_CAIRO_GFX
OS_LIBS += $(call EXPAND_LIBNAME,usp10 msimg32) OS_LIBS += $(call EXPAND_LIBNAME,usp10 msimg32)
ifdef MOZ_ENABLE_GLITZ ifdef MOZ_ENABLE_GLITZ
OS_LIBS += $(call EXPAND_LIBNAME,opengl32) OS_LIBS += $(call EXPAND_LIBNAME,opengl32)
endif endif
endif
RCINCLUDE = splash.rc RCINCLUDE = splash.rc
ifndef GNU_CC ifndef GNU_CC

1
config/autoconf.mk.in
Просмотреть файл

@ -467,7 +467,6 @@ MOZ_TOOLKIT_REGISTRY_CFLAGS = \
CAIRO_FT_CFLAGS = @CAIRO_FT_CFLAGS@ CAIRO_FT_CFLAGS = @CAIRO_FT_CFLAGS@
MOZ_ENABLE_CAIRO_GFX = @MOZ_ENABLE_CAIRO_GFX@
MOZ_ENABLE_CAIRO_FT = @MOZ_ENABLE_CAIRO_FT@ MOZ_ENABLE_CAIRO_FT = @MOZ_ENABLE_CAIRO_FT@
MOZ_ENABLE_GLITZ = @MOZ_ENABLE_GLITZ@ MOZ_ENABLE_GLITZ = @MOZ_ENABLE_GLITZ@
MOZ_ENABLE_GTK2 = @MOZ_ENABLE_GTK2@ MOZ_ENABLE_GTK2 = @MOZ_ENABLE_GTK2@

227
configure.in
Просмотреть файл

@ -4541,13 +4541,11 @@ photon)
cairo-windows) cairo-windows)
MOZ_WIDGET_TOOLKIT=windows MOZ_WIDGET_TOOLKIT=windows
MOZ_GFX_TOOLKIT=cairo MOZ_GFX_TOOLKIT=cairo
MOZ_ENABLE_CAIRO_GFX=1
;; ;;
cairo-gtk2) cairo-gtk2)
MOZ_WIDGET_TOOLKIT=gtk2 MOZ_WIDGET_TOOLKIT=gtk2
MOZ_GFX_TOOLKIT=cairo MOZ_GFX_TOOLKIT=cairo
MOZ_ENABLE_CAIRO_GFX=1
MOZ_ENABLE_GTK2=1 MOZ_ENABLE_GTK2=1
MOZ_ENABLE_XREMOTE=1 MOZ_ENABLE_XREMOTE=1
TK_CFLAGS='$(MOZ_GTK2_CFLAGS)' TK_CFLAGS='$(MOZ_GTK2_CFLAGS)'
@ -4557,7 +4555,6 @@ cairo-gtk2)
cairo-beos) cairo-beos)
MOZ_WIDGET_TOOLKIT=beos MOZ_WIDGET_TOOLKIT=beos
MOZ_GFX_TOOLKIT=cairo MOZ_GFX_TOOLKIT=cairo
MOZ_ENABLE_CAIRO_GFX=1
TK_CFLAGS='$(MOZ_CAIRO_CFLAGS)' TK_CFLAGS='$(MOZ_CAIRO_CFLAGS)'
TK_LIBS='$(MOZ_CAIRO_LIBS)' TK_LIBS='$(MOZ_CAIRO_LIBS)'
;; ;;
@ -4565,7 +4562,6 @@ cairo-beos)
cairo-os2) cairo-os2)
MOZ_WIDGET_TOOLKIT=os2 MOZ_WIDGET_TOOLKIT=os2
MOZ_GFX_TOOLKIT=cairo MOZ_GFX_TOOLKIT=cairo
MOZ_ENABLE_CAIRO_GFX=1
TK_CFLAGS='$(MOZ_CAIRO_CFLAGS)' TK_CFLAGS='$(MOZ_CAIRO_CFLAGS)'
TK_LIBS='$(MOZ_CAIRO_LIBS)' TK_LIBS='$(MOZ_CAIRO_LIBS)'
;; ;;
@ -4578,7 +4574,6 @@ cairo-mac|cairo-cocoa)
else else
MOZ_WIDGET_TOOLKIT=mac MOZ_WIDGET_TOOLKIT=mac
fi fi
MOZ_ENABLE_CAIRO_GFX=1
MOZ_GFX_TOOLKIT=cairo MOZ_GFX_TOOLKIT=cairo
MOZ_USER_DIR="Mozilla" MOZ_USER_DIR="Mozilla"
AC_DEFINE(XP_MACOSX) AC_DEFINE(XP_MACOSX)
@ -4646,7 +4641,6 @@ AC_SUBST(TK_LIBS)
AC_SUBST(MOZ_ENABLE_GTK2) AC_SUBST(MOZ_ENABLE_GTK2)
AC_SUBST(MOZ_ENABLE_PHOTON) AC_SUBST(MOZ_ENABLE_PHOTON)
AC_SUBST(MOZ_ENABLE_COCOA) AC_SUBST(MOZ_ENABLE_COCOA)
AC_SUBST(MOZ_ENABLE_CAIRO_GFX)
AC_SUBST(MOZ_ENABLE_GLITZ) AC_SUBST(MOZ_ENABLE_GLITZ)
AC_SUBST(MOZ_ENABLE_XREMOTE) AC_SUBST(MOZ_ENABLE_XREMOTE)
AC_SUBST(MOZ_GTK2_CFLAGS) AC_SUBST(MOZ_GTK2_CFLAGS)
@ -4654,11 +4648,8 @@ AC_SUBST(MOZ_GTK2_LIBS)
AC_SUBST(MOC) AC_SUBST(MOC)
if test "$MOZ_ENABLE_CAIRO_GFX" AC_DEFINE(MOZ_THEBES)
then AC_DEFINE(MOZ_CAIRO_GFX)
AC_DEFINE(MOZ_THEBES)
AC_DEFINE(MOZ_CAIRO_GFX)
fi
if test "$MOZ_ENABLE_GTK2" if test "$MOZ_ENABLE_GTK2"
then then
@ -5526,14 +5517,10 @@ MOZ_ARG_DISABLE_BOOL(svg,
MOZ_SVG=, MOZ_SVG=,
MOZ_SVG=1 ) MOZ_SVG=1 )
if test -n "$MOZ_SVG"; then if test -n "$MOZ_SVG"; then
if test -z "$MOZ_ENABLE_CAIRO_GFX"; then AC_DEFINE(MOZ_SVG)
AC_MSG_ERROR([SVG requires cairo gfx])
else
AC_DEFINE(MOZ_SVG)
fi
fi fi
MOZ_SVG_FOREIGNOBJECT=$MOZ_ENABLE_CAIRO_GFX MOZ_SVG_FOREIGNOBJECT=1
dnl ======================================================== dnl ========================================================
dnl SVG <foreignObject> dnl SVG <foreignObject>
dnl ======================================================== dnl ========================================================
@ -5543,14 +5530,10 @@ MOZ_ARG_DISABLE_BOOL(svg-foreignobject,
MOZ_SVG_FOREIGNOBJECT=, MOZ_SVG_FOREIGNOBJECT=,
MOZ_SVG_FOREIGNOBJECT=1 ) MOZ_SVG_FOREIGNOBJECT=1 )
if test "$MOZ_SVG_FOREIGNOBJECT"; then if test "$MOZ_SVG_FOREIGNOBJECT"; then
if test -z "$MOZ_ENABLE_CAIRO_GFX"; then if test "$MOZ_SVG"; then
AC_MSG_ERROR([<foreignobject> requires cairo gfx]) AC_DEFINE(MOZ_SVG_FOREIGNOBJECT)
else else
if test "$MOZ_SVG"; then MOZ_SVG_FOREIGNOBEJCT=
AC_DEFINE(MOZ_SVG_FOREIGNOBJECT)
else
MOZ_SVG_FOREIGNOBEJCT=
fi
fi fi
fi fi
@ -6890,115 +6873,113 @@ AC_SUBST(MOZ_LIBART_LIBS)
dnl ======================================================== dnl ========================================================
dnl Check for cairo dnl Check for cairo
dnl ======================================================== dnl ========================================================
if test "$MOZ_SVG" -o "$MOZ_ENABLE_CANVAS" -o "$MOZ_ENABLE_CAIRO_GFX" ; then MOZ_CAIRO_CFLAGS='-I$(LIBXUL_DIST)/include/cairo'
MOZ_CAIRO_CFLAGS='-I$(LIBXUL_DIST)/include/cairo'
MOZ_TREE_CAIRO=1 MOZ_TREE_CAIRO=1
MOZ_ARG_ENABLE_BOOL(system-cairo, MOZ_ARG_ENABLE_BOOL(system-cairo,
[ --enable-system-cairo Use system cairo (located with pkgconfig)], [ --enable-system-cairo Use system cairo (located with pkgconfig)],
MOZ_TREE_CAIRO=, MOZ_TREE_CAIRO=,
MOZ_TREE_CAIRO=1 ) MOZ_TREE_CAIRO=1 )
# Check for headers defining standard int types. # Check for headers defining standard int types.
AC_CHECK_HEADERS(stdint.h inttypes.h sys/int_types.h) AC_CHECK_HEADERS(stdint.h inttypes.h sys/int_types.h)
if test "$MOZ_TREE_CAIRO"; then if test "$MOZ_TREE_CAIRO"; then
# For now we assume that we will have a uint64_t available through # For now we assume that we will have a uint64_t available through
# one of the above headers or mozstdint.h. # one of the above headers or mozstdint.h.
AC_DEFINE(HAVE_UINT64_T) AC_DEFINE(HAVE_UINT64_T)
# Define macros for cairo-features.h # Define macros for cairo-features.h
if test "$MOZ_X11"; then if test "$MOZ_X11"; then
XLIB_SURFACE_FEATURE="#define CAIRO_HAS_XLIB_SURFACE 1" XLIB_SURFACE_FEATURE="#define CAIRO_HAS_XLIB_SURFACE 1"
XLIB_XRENDER_SURFACE_FEATURE="#define CAIRO_HAS_XLIB_XRENDER_SURFACE 1" XLIB_XRENDER_SURFACE_FEATURE="#define CAIRO_HAS_XLIB_XRENDER_SURFACE 1"
PS_SURFACE_FEATURE="#define CAIRO_HAS_PS_SURFACE 1" PS_SURFACE_FEATURE="#define CAIRO_HAS_PS_SURFACE 1"
PDF_SURFACE_FEATURE="#define CAIRO_HAS_PDF_SURFACE 1" PDF_SURFACE_FEATURE="#define CAIRO_HAS_PDF_SURFACE 1"
FT_FONT_FEATURE="#define CAIRO_HAS_FT_FONT 1" FT_FONT_FEATURE="#define CAIRO_HAS_FT_FONT 1"
MOZ_ENABLE_CAIRO_FT=1 MOZ_ENABLE_CAIRO_FT=1
CAIRO_FT_CFLAGS="$FT2_CFLAGS" CAIRO_FT_CFLAGS="$FT2_CFLAGS"
fi fi
if test "$MOZ_WIDGET_TOOLKIT" = "mac" -o "$MOZ_WIDGET_TOOLKIT" = "cocoa"; then if test "$MOZ_WIDGET_TOOLKIT" = "mac" -o "$MOZ_WIDGET_TOOLKIT" = "cocoa"; then
QUARTZ_SURFACE_FEATURE="#define CAIRO_HAS_QUARTZ_SURFACE 1" QUARTZ_SURFACE_FEATURE="#define CAIRO_HAS_QUARTZ_SURFACE 1"
ATSUI_FONT_FEATURE="#define CAIRO_HAS_ATSUI_FONT 1" ATSUI_FONT_FEATURE="#define CAIRO_HAS_ATSUI_FONT 1"
fi fi
if test "$MOZ_WIDGET_TOOLKIT" = "windows"; then if test "$MOZ_WIDGET_TOOLKIT" = "windows"; then
WIN32_SURFACE_FEATURE="#define CAIRO_HAS_WIN32_SURFACE 1" WIN32_SURFACE_FEATURE="#define CAIRO_HAS_WIN32_SURFACE 1"
WIN32_FONT_FEATURE="#define CAIRO_HAS_WIN32_FONT 1" WIN32_FONT_FEATURE="#define CAIRO_HAS_WIN32_FONT 1"
PDF_SURFACE_FEATURE="#define CAIRO_HAS_PDF_SURFACE 1" PDF_SURFACE_FEATURE="#define CAIRO_HAS_PDF_SURFACE 1"
fi fi
if test "$MOZ_WIDGET_TOOLKIT" = "os2"; then if test "$MOZ_WIDGET_TOOLKIT" = "os2"; then
OS2_SURFACE_FEATURE="#define CAIRO_HAS_OS2_SURFACE 1" OS2_SURFACE_FEATURE="#define CAIRO_HAS_OS2_SURFACE 1"
FT_FONT_FEATURE="#define CAIRO_HAS_FT_FONT 1" FT_FONT_FEATURE="#define CAIRO_HAS_FT_FONT 1"
PDF_SURFACE_FEATURE="#define CAIRO_HAS_PDF_SURFACE 1" PDF_SURFACE_FEATURE="#define CAIRO_HAS_PDF_SURFACE 1"
MOZ_ENABLE_CAIRO_FT=1 MOZ_ENABLE_CAIRO_FT=1
CAIRO_FT_CFLAGS="-I${MZFTCFGFT2}/include" CAIRO_FT_CFLAGS="-I${MZFTCFGFT2}/include"
CAIRO_FT_LIBS="-L${MZFTCFGFT2}/lib -lmozft -lmzfntcfg" CAIRO_FT_LIBS="-L${MZFTCFGFT2}/lib -lmozft -lmzfntcfg"
fi fi
if test "$MOZ_ENABLE_GLITZ"; then if test "$MOZ_ENABLE_GLITZ"; then
GLITZ_SURFACE_FEATURE="#define CAIRO_HAS_GLITZ_SURFACE 1" GLITZ_SURFACE_FEATURE="#define CAIRO_HAS_GLITZ_SURFACE 1"
fi fi
if test "$MOZ_WIDGET_TOOLKIT" = "beos"; then if test "$MOZ_WIDGET_TOOLKIT" = "beos"; then
PKG_CHECK_MODULES(CAIRO_FT, fontconfig freetype2) PKG_CHECK_MODULES(CAIRO_FT, fontconfig freetype2)
BEOS_SURFACE_FEATURE="#define CAIRO_HAS_BEOS_SURFACE 1" BEOS_SURFACE_FEATURE="#define CAIRO_HAS_BEOS_SURFACE 1"
FT_FONT_FEATURE="#define CAIRO_HAS_FT_FONT 1" FT_FONT_FEATURE="#define CAIRO_HAS_FT_FONT 1"
MOZ_ENABLE_CAIRO_FT=1 MOZ_ENABLE_CAIRO_FT=1
fi fi
AC_SUBST(MOZ_ENABLE_CAIRO_FT) AC_SUBST(MOZ_ENABLE_CAIRO_FT)
AC_SUBST(CAIRO_FT_CFLAGS) AC_SUBST(CAIRO_FT_CFLAGS)
if test "$MOZ_DEBUG"; then if test "$MOZ_DEBUG"; then
SANITY_CHECKING_FEATURE="#define CAIRO_DO_SANITY_CHECKING 1" SANITY_CHECKING_FEATURE="#define CAIRO_DO_SANITY_CHECKING 1"
else else
SANITY_CHECKING_FEATURE="#undef CAIRO_DO_SANITY_CHECKING" SANITY_CHECKING_FEATURE="#undef CAIRO_DO_SANITY_CHECKING"
fi fi
PNG_FUNCTIONS_FEATURE="#define CAIRO_HAS_PNG_FUNCTIONS 1" PNG_FUNCTIONS_FEATURE="#define CAIRO_HAS_PNG_FUNCTIONS 1"
AC_SUBST(PS_SURFACE_FEATURE) AC_SUBST(PS_SURFACE_FEATURE)
AC_SUBST(PDF_SURFACE_FEATURE) AC_SUBST(PDF_SURFACE_FEATURE)
AC_SUBST(SVG_SURFACE_FEATURE) AC_SUBST(SVG_SURFACE_FEATURE)
AC_SUBST(XLIB_SURFACE_FEATURE) AC_SUBST(XLIB_SURFACE_FEATURE)
AC_SUBST(XLIB_XRENDER_SURFACE_FEATURE) AC_SUBST(XLIB_XRENDER_SURFACE_FEATURE)
AC_SUBST(QUARTZ_SURFACE_FEATURE) AC_SUBST(QUARTZ_SURFACE_FEATURE)
AC_SUBST(NQUARTZ_SURFACE_FEATURE) AC_SUBST(NQUARTZ_SURFACE_FEATURE)
AC_SUBST(XCB_SURFACE_FEATURE) AC_SUBST(XCB_SURFACE_FEATURE)
AC_SUBST(WIN32_SURFACE_FEATURE) AC_SUBST(WIN32_SURFACE_FEATURE)
AC_SUBST(OS2_SURFACE_FEATURE) AC_SUBST(OS2_SURFACE_FEATURE)
AC_SUBST(BEOS_SURFACE_FEATURE) AC_SUBST(BEOS_SURFACE_FEATURE)
AC_SUBST(GLITZ_SURFACE_FEATURE) AC_SUBST(GLITZ_SURFACE_FEATURE)
AC_SUBST(DIRECTFB_SURFACE_FEATURE) AC_SUBST(DIRECTFB_SURFACE_FEATURE)
AC_SUBST(FT_FONT_FEATURE) AC_SUBST(FT_FONT_FEATURE)
AC_SUBST(WIN32_FONT_FEATURE) AC_SUBST(WIN32_FONT_FEATURE)
AC_SUBST(ATSUI_FONT_FEATURE) AC_SUBST(ATSUI_FONT_FEATURE)
AC_SUBST(PNG_FUNCTIONS_FEATURE) AC_SUBST(PNG_FUNCTIONS_FEATURE)
if test "$_WIN32_MSVC"; then if test "$_WIN32_MSVC"; then
MOZ_CAIRO_LIBS='$(DEPTH)/gfx/cairo/cairo/src/mozcairo.lib $(DEPTH)/gfx/cairo/libpixman/src/mozlibpixman.lib' MOZ_CAIRO_LIBS='$(DEPTH)/gfx/cairo/cairo/src/mozcairo.lib $(DEPTH)/gfx/cairo/libpixman/src/mozlibpixman.lib'
if test "$MOZ_ENABLE_GLITZ"; then if test "$MOZ_ENABLE_GLITZ"; then
MOZ_CAIRO_LIBS="$MOZ_CAIRO_LIBS "'$(DEPTH)/gfx/cairo/glitz/src/mozglitz.lib $(DEPTH)/gfx/cairo/glitz/src/wgl/mozglitzwgl.lib' MOZ_CAIRO_LIBS="$MOZ_CAIRO_LIBS "'$(DEPTH)/gfx/cairo/glitz/src/mozglitz.lib $(DEPTH)/gfx/cairo/glitz/src/wgl/mozglitzwgl.lib'
fi fi
else else
MOZ_CAIRO_LIBS='$(DEPTH)/gfx/cairo/cairo/src/$(LIB_PREFIX)mozcairo.$(LIB_SUFFIX) $(DEPTH)/gfx/cairo/libpixman/src/$(LIB_PREFIX)mozlibpixman.$(LIB_SUFFIX)'" $CAIRO_FT_LIBS" MOZ_CAIRO_LIBS='$(DEPTH)/gfx/cairo/cairo/src/$(LIB_PREFIX)mozcairo.$(LIB_SUFFIX) $(DEPTH)/gfx/cairo/libpixman/src/$(LIB_PREFIX)mozlibpixman.$(LIB_SUFFIX)'" $CAIRO_FT_LIBS"
if test "$MOZ_X11"; then if test "$MOZ_X11"; then
MOZ_CAIRO_LIBS="$MOZ_CAIRO_LIBS $XLDFLAGS -lXrender -lfreetype -lfontconfig" MOZ_CAIRO_LIBS="$MOZ_CAIRO_LIBS $XLDFLAGS -lXrender -lfreetype -lfontconfig"
fi fi
if test "$MOZ_ENABLE_GLITZ"; then if test "$MOZ_ENABLE_GLITZ"; then
MOZ_CAIRO_LIBS="$MOZ_CAIRO_LIBS "'-L$(DEPTH)/gfx/cairo/glitz/src -lmozglitz' MOZ_CAIRO_LIBS="$MOZ_CAIRO_LIBS "'-L$(DEPTH)/gfx/cairo/glitz/src -lmozglitz'
if test "$MOZ_X11"; then if test "$MOZ_X11"; then
MOZ_CAIRO_LIBS="$MOZ_CAIRO_LIBS "'-L$(DEPTH)/gfx/cairo/glitz/src/glx -lmozglitzglx -lGL' MOZ_CAIRO_LIBS="$MOZ_CAIRO_LIBS "'-L$(DEPTH)/gfx/cairo/glitz/src/glx -lmozglitzglx -lGL'
fi fi
if test "$MOZ_WIDGET_TOOLKIT" = "windows"; then if test "$MOZ_WIDGET_TOOLKIT" = "windows"; then
MOZ_CAIRO_LIBS="$MOZ_CAIRO_LIBS "'-L$(DEPTH)/gfx/cairo/glitz/src/wgl -lmozglitzwgl' MOZ_CAIRO_LIBS="$MOZ_CAIRO_LIBS "'-L$(DEPTH)/gfx/cairo/glitz/src/wgl -lmozglitzwgl'
fi fi
fi fi
fi fi
else else
PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_VERSION freetype2 fontconfig) PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_VERSION freetype2 fontconfig)
MOZ_CAIRO_CFLAGS=$CAIRO_CFLAGS MOZ_CAIRO_CFLAGS=$CAIRO_CFLAGS
MOZ_CAIRO_LIBS=$CAIRO_LIBS MOZ_CAIRO_LIBS=$CAIRO_LIBS
fi
fi fi
AC_SUBST(MOZ_TREE_CAIRO) AC_SUBST(MOZ_TREE_CAIRO)

12
content/canvas/src/Makefile.in
Просмотреть файл

@ -75,12 +75,9 @@ REQUIRES = \
plugin \ plugin \
cairo \ cairo \
libpixman \ libpixman \
thebes \
$(NULL) $(NULL)
ifdef MOZ_ENABLE_CAIRO_GFX
REQUIRES += thebes
endif
# XXX some platforms can't handle building # XXX some platforms can't handle building
# an empty .a/lib. Remove this dummy.cpp # an empty .a/lib. Remove this dummy.cpp
# whenever w have a rendering context # whenever w have a rendering context
@ -100,11 +97,4 @@ include $(topsrcdir)/config/rules.mk
CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS) CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS)
ifndef MOZ_ENABLE_CAIRO_GFX
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
# needed for nsDrawingSurfaceMac.h
CXXFLAGS += -I$(topsrcdir)/gfx/src/mac
endif
endif
DEFINES += -D_IMPL_NS_LAYOUT DEFINES += -D_IMPL_NS_LAYOUT

20
layout/build/Makefile.in
Просмотреть файл

@ -64,9 +64,7 @@ PACKAGE_VARS += MOZ_XUL
ifndef MOZ_ENABLE_LIBXUL ifndef MOZ_ENABLE_LIBXUL
EXTRA_DSO_LIBS = gkgfx EXTRA_DSO_LIBS = gkgfx
endif endif
ifdef MOZ_ENABLE_CAIRO_GFX
EXTRA_DSO_LIBS += thebes EXTRA_DSO_LIBS += thebes
endif
REQUIRES = xpcom \ REQUIRES = xpcom \
string \ string \
@ -100,12 +98,9 @@ REQUIRES = xpcom \
webbrwsr \ webbrwsr \
uconv \ uconv \
txtsvc \ txtsvc \
thebes \
$(NULL) $(NULL)
ifdef MOZ_ENABLE_CAIRO_GFX
REQUIRES += thebes
endif
CPPSRCS = \ CPPSRCS = \
nsLayoutModule.cpp \ nsLayoutModule.cpp \
nsContentDLF.cpp \ nsContentDLF.cpp \
@ -227,21 +222,10 @@ ifdef NS_TRACE_MALLOC
EXTRA_DSO_LIBS += tracemalloc EXTRA_DSO_LIBS += tracemalloc
endif endif
ifdef MOZ_ENABLE_CAIRO_GFX
EXTRA_DSO_LIBS += thebes
else
ifdef MOZ_ENABLE_CANVAS
EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS)
endif
endif
ifdef MOZ_ENABLE_GTK2 ifdef MOZ_ENABLE_GTK2
EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS) \ EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS) \
-lXrender \
$(NULL) $(NULL)
ifdef MOZ_ENABLE_CAIRO_GFX
EXTRA_DSO_LDOPTS += -lXrender \
$(NULL)
endif
endif endif
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))

6
layout/generic/Makefile.in
Просмотреть файл

@ -80,6 +80,8 @@ REQUIRES = xpcom \
exthandler \ exthandler \
intl \ intl \
uconv \ uconv \
thebes \
cairo \
$(NULL) $(NULL)
# Sun's Complex Text Layout support # Sun's Complex Text Layout support
@ -87,10 +89,6 @@ ifdef SUNCTL
REQUIRES += ctl REQUIRES += ctl
endif endif
ifdef MOZ_ENABLE_CAIRO_GFX
REQUIRES += thebes cairo
endif
EXPORTS = \ EXPORTS = \
nsFrameList.h \ nsFrameList.h \
nsHTMLParts.h \ nsHTMLParts.h \

5
modules/libpr0n/build/Makefile.in
Просмотреть файл

@ -90,12 +90,9 @@ SHARED_LIBRARY_LIBS = \
EXTRA_DSO_LIBS = \ EXTRA_DSO_LIBS = \
gkgfx \ gkgfx \
thebes \
$(NULL) $(NULL)
ifdef MOZ_ENABLE_CAIRO_GFX
EXTRA_DSO_LIBS += thebes
endif
EXTRA_DSO_LDOPTS = \ EXTRA_DSO_LDOPTS = \
$(LIBS_DIR) \ $(LIBS_DIR) \
$(JPEG_LIBS) \ $(JPEG_LIBS) \

2
modules/staticmod/Makefile.in
Просмотреть файл

@ -86,10 +86,8 @@ OS_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 v
ifdef GNU_CC ifdef GNU_CC
OS_LIBS += $(call EXPAND_LIBNAME,winmm wsock32 gdi32) OS_LIBS += $(call EXPAND_LIBNAME,winmm wsock32 gdi32)
endif endif
ifdef MOZ_ENABLE_CAIRO_GFX
OS_LIBS += $(call EXPAND_LIBNAME, usp10) OS_LIBS += $(call EXPAND_LIBNAME, usp10)
endif endif
endif
ifneq (,$(MOZ_ENABLE_GTK2)) ifneq (,$(MOZ_ENABLE_GTK2))
OS_LIBS += $(XLDFLAGS) $(XT_LIBS) OS_LIBS += $(XLDFLAGS) $(XT_LIBS)

19
toolkit/library/libxul-config.mk
Просмотреть файл

@ -283,28 +283,9 @@ COMPONENT_LIBS += imgicon
endif endif
endif endif
ifdef MOZ_ENABLE_CAIRO_GFX
STATIC_LIBS += thebes STATIC_LIBS += thebes
COMPONENT_LIBS += gkgfxthebes COMPONENT_LIBS += gkgfxthebes
else # Platform-specific GFX layer
ifeq (windows,$(MOZ_WIDGET_TOOLKIT))
COMPONENT_LIBS += gkgfxwin
endif
ifeq (beos,$(MOZ_WIDGET_TOOLKIT))
COMPONENT_LIBS += gfx_beos
endif
ifeq (os2,$(MOZ_WIDGET_TOOLKIT))
COMPONENT_LIBS += gfx_os2
endif
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
COMPONENT_LIBS += gfx_mac
endif
ifdef MOZ_ENABLE_PHOTON
COMPONENT_LIBS += gfx_photon
endif
endif
ifeq (windows,$(MOZ_WIDGET_TOOLKIT)) ifeq (windows,$(MOZ_WIDGET_TOOLKIT))
COMPONENT_LIBS += gkwidget COMPONENT_LIBS += gkwidget
endif endif

2
toolkit/library/libxul-rules.mk
Просмотреть файл

@ -69,7 +69,6 @@ DEFINES += \
-D_IMPL_NS_WIDGET \ -D_IMPL_NS_WIDGET \
$(NULL) $(NULL)
ifdef MOZ_ENABLE_CAIRO_GFX
ifeq ($(MOZ_WIDGET_TOOLKIT),windows) ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
OS_LIBS += $(call EXPAND_LIBNAME,usp10) OS_LIBS += $(call EXPAND_LIBNAME,usp10)
endif endif
@ -79,7 +78,6 @@ ifdef MOZ_ENABLE_GLITZ
EXTRA_DSO_LDOPTS += -lmozglitzagl -framework OpenGL -framework AGL EXTRA_DSO_LDOPTS += -lmozglitzagl -framework OpenGL -framework AGL
endif endif
endif endif
endif # MOZ_ENABLE_CAIRO_GFX
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
EXTRA_DSO_LDOPTS += $(MOZ_PANGO_LIBS) EXTRA_DSO_LDOPTS += $(MOZ_PANGO_LIBS)

8
view/src/Makefile.in
Просмотреть файл

@ -55,12 +55,10 @@ REQUIRES = xpcom \
widget \ widget \
dom \ dom \
pref \ pref \
thebes \
cairo \
$(NULL) $(NULL)
ifdef MOZ_ENABLE_CAIRO_GFX
REQUIRES += thebes cairo
endif
EXTRA_DSO_LIBS = gkgfx EXTRA_DSO_LIBS = gkgfx
CPPSRCS = \ CPPSRCS = \
@ -71,6 +69,4 @@ CPPSRCS = \
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk
ifdef MOZ_ENABLE_CAIRO_GFX
CXXFLAGS += $(MOZ_CAIRO_CFLAGS) CXXFLAGS += $(MOZ_CAIRO_CFLAGS)
endif

8
widget/src/build/Makefile.in
Просмотреть файл

@ -66,11 +66,9 @@ REQUIRES = xpcom \
CPPSRCS = nsWinWidgetFactory.cpp CPPSRCS = nsWinWidgetFactory.cpp
EXTRA_DSO_LIBS = gkgfx EXTRA_DSO_LIBS = gkgfx \
thebes \
ifdef MOZ_ENABLE_CAIRO_GFX $(NULL)
EXTRA_DSO_LIBS += thebes
endif
LOCAL_INCLUDES = \ LOCAL_INCLUDES = \
-I$(srcdir) \ -I$(srcdir) \