From 90ae411cfdbb78bd146a5a5d970222ddde69557e Mon Sep 17 00:00:00 2001 From: "vladimir%pobox.com" Date: Sat, 20 Aug 2005 06:21:16 +0000 Subject: [PATCH] cairo landing: misc build fixes for thebes backend --- allmakefiles.sh | 5 ++++- browser/app/Makefile.in | 4 ++++ config/autoconf.mk.in | 1 + gfx/Makefile.in | 1 + 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/allmakefiles.sh b/allmakefiles.sh index b5750f5efcb..ebc08aa7c40 100755 --- a/allmakefiles.sh +++ b/allmakefiles.sh @@ -171,7 +171,7 @@ gfx/src/xlib/Makefile gfx/src/os2/Makefile gfx/src/xlibrgb/Makefile gfx/src/windows/Makefile -gfx/src/cairo/Makefile +gfx/src/thebes/Makefile gfx/tests/Makefile " @@ -181,6 +181,9 @@ gfx/cairo/Makefile gfx/cairo/libpixman/src/Makefile gfx/cairo/cairo/src/Makefile gfx/cairo/cairo/src/cairo-features.h +gfx/cairo/glitz/src/Makefile +gfx/cairo/glitz/src/glx/Makefile +gfx/cairo/glitz/src/wgl/Makefile " fi diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in index 4c06e2501a8..94d435cfad5 100644 --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in @@ -128,6 +128,10 @@ endif ifeq ($(OS_ARCH),WINNT) OS_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool gdi32) +ifdef MOZ_ENABLE_CAIRO_GFX +OS_LIBS += $(call EXPAND_LIBNAME,usp10) +endif + RCINCLUDE = splash.rc ifndef GNU_CC RCFLAGS += -DMOZ_PHOENIX -I$(srcdir) diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in index c3bb82c66f3..72426085069 100644 --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in @@ -423,6 +423,7 @@ MOZ_TOOLKIT_REGISTRY_CFLAGS = \ $(TK_CFLAGS) MOZ_ENABLE_CAIRO_GFX = @MOZ_ENABLE_CAIRO_GFX@ +MOZ_ENABLE_GLITZ = @MOZ_ENABLE_GLITZ@ MOZ_ENABLE_GTK = @MOZ_ENABLE_GTK@ MOZ_ENABLE_GTK2 = @MOZ_ENABLE_GTK2@ MOZ_ENABLE_XLIB = @MOZ_ENABLE_XLIB@ diff --git a/gfx/Makefile.in b/gfx/Makefile.in index a9b2a1d7216..8f9693ef91a 100644 --- a/gfx/Makefile.in +++ b/gfx/Makefile.in @@ -47,6 +47,7 @@ MODULE = gfx ifdef MOZ_TREE_CAIRO DIRS = cairo endif + ifdef MOZ_ENABLE_CAIRO_GFX DIRS += thebes endif