cairo landing: misc build fixes for thebes backend

2005-08-20 06:21:16 +00:00 · 2005-08-20 06:21:16 +00:00 · 90ae411cfd
--- 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

--- 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)
--- 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@
--- 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