Bug 320316 - libxul doesn't compile with thebes (c9ff5b4a) · Commits · The Tor Project / Applications / Mullvad Browser

toolkit/library/libxul-config.mk

+34 −19

Original line number	Diff line number	Diff line
		@@ -182,27 +182,26 @@ DEFINES += -DICON_DECODER
		COMPONENT_LIBS += imgicon
		endif
		endif
		ifeq (windows,$(MOZ_WIDGET_TOOLKIT))
		COMPONENT_LIBS += gkgfxwin gkwidget

		ifdef MOZ_ENABLE_CAIRO_GFX
		COMPONENT_LIBS += gkgfxthebes
		else # Platform-specific GFX layer
		ifeq (windows,$(MOZ_GFX_TOOLKIT))
		COMPONENT_LIBS += gkgfxwin
		endif
		ifeq (beos,$(MOZ_WIDGET_TOOLKIT))
		COMPONENT_LIBS += gfx_beos widget_beos
		ifeq (beos,$(MOZ_GFX_TOOLKIT))
		COMPONENT_LIBS += gfx_beos
		endif
		ifeq (os2,$(MOZ_WIDGET_TOOLKIT))
		COMPONENT_LIBS += gfx_os2 wdgtos2
		ifeq (os2,$(MOZ_GFX_TOOLKIT))
		COMPONENT_LIBS += gfx_os2
		endif
		ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
		COMPONENT_LIBS += gfx_mac widget_mac
		ifneq (,$(filter mac cocoa,$(MOZ_GFX_TOOLKIT)))
		COMPONENT_LIBS += gfx_mac
		endif
		ifeq (qt,$(MOZ_WIDGET_TOOLKIT))
		ifeq (qt,$(MOZ_GFX_TOOLKIT))
		COMPONENT_LIBS += widget_qt
		endif

		ifdef MOZ_ENABLE_CAIRO_GFX
		DEFINES += -DMOZ_ENABLE_CAIRO_GFX
		COMPONENT_LIBS += gkgfxcairo
		else
		ifneq (,$(MOZ_ENABLE_GTK)$(MOZ_ENABLE_GTK2))
		ifneq (,$(filter gtk gtk2,$(MOZ_GFX_TOOLKIT)))
		COMPONENT_LIBS += gfx_gtk
		endif
		ifdef MOZ_ENABLE_QT
		@@ -216,6 +215,22 @@ else
		endif
		endif

		ifeq (windows,$(MOZ_WIDGET_TOOLKIT))
		COMPONENT_LIBS += gkwidget
		endif
		ifeq (beos,$(MOZ_WIDGET_TOOLKIT))
		COMPONENT_LIBS += widget_beos
		endif
		ifeq (os2,$(MOZ_WIDGET_TOOLKIT))
		COMPONENT_LIBS += wdgtos2
		endif
		ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
		COMPONENT_LIBS += widget_mac
		endif
		ifeq (qt,$(MOZ_WIDGET_TOOLKIT))
		COMPONENT_LIBS += widget_qt
		endif

		ifdef MOZ_ENABLE_XLIB
		COMPONENT_LIBS += widget_xlib
		endif

toolkit/library/libxul-rules.mk

+11 −0

Original line number	Diff line number	Diff line
		@@ -70,6 +70,17 @@ DEFINES += \
		-D_IMPL_NS_WIDGET \
		$(NULL)

		ifdef MOZ_ENABLE_CAIRO_GFX
		ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
		OS_LIBS += usp10.lib
		endif
		ifneq (,$(filter $(MOZ_GFX_TOOLKIT),mac cocoa))
		ifdef MOZ_ENABLE_GLITZ
		EXTRA_DSO_LDOPTS += -lmozglitzagl -framework OpenGL -framework AGL
		endif
		endif
		endif # MOZ_ENABLE_CAIRO_GFX

		ifdef MOZ_SVG_RENDERER_GDIPLUS
		OS_LIBS += Gdiplus.lib
		endif

toolkit/library/nsStaticXULComponents.cpp

+35 −33

Original line number	Diff line number	Diff line
		@@ -71,21 +71,7 @@
		#define POSTSCRIPT_MODULES
		#endif

		#ifdef XP_WIN
		# define GFX_MODULES MODULE(nsGfxModule)
		# define WIDGET_MODULES MODULE(nsWidgetModule)
		#elif defined(XP_MACOSX)
		# define GFX_MODULES MODULE(nsGfxMacModule)
		# define WIDGET_MODULES MODULE(nsWidgetMacModule)
		#elif defined(XP_BEOS)
		# define GFX_MODULES MODULE(nsGfxBeOSModule)
		# define WIDGET_MODULES MODULE(nsWidgetBeOSModule)
		#elif defined(XP_OS2)
		# define GFX_MODULES MODULE(nsGfxOS2Module)
		# define WIDGET_MODULES MODULE(nsWidgetOS2Module)
		#endif

		#ifdef MOZ_ENABLE_CAIRO_GFX
		#ifdef MOZ_CAIRO_GFX
		# define GFX_MODULES MODULE(nsGfxModule)
		#else
		# if defined(MOZ_WIDGET_GTK) \|\| defined(MOZ_WIDGET_GTK2)
		@@ -96,29 +82,45 @@
		# define GFX_MODULES MODULE(nsGfxXlibModule)
		# elif defined(MOZ_WIDGET_PHOTON)
		# define GFX_MODULES MODULE(nsGfxPhModule)
		# endif
		#endif

		#ifdef ICON_DECODER
		#define ICON_MODULE MODULE(nsIconDecoderModule)
		# elif defined(XP_WIN)
		# define GFX_MODULES MODULE(nsGfxModule)
		# elif defined(XP_MACOSX)
		# define GFX_MODULES MODULE(nsGfxMacModule)
		# elif defined(XP_BEOS)
		# define GFX_MODULES MODULE(nsGfxBeOSModule)
		# elif defined(XP_OS2)
		# define GFX_MODULES MODULE(nsGfxOS2Module)
		# else
		#define ICON_MODULE
		# error Unknown GFX module.
		# endif
		#endif

		#ifdef MOZ_WIDGET_GTK
		#ifdef XP_WIN
		# define WIDGET_MODULES MODULE(nsWidgetModule)
		#elif defined(XP_MACOSX)
		# define WIDGET_MODULES MODULE(nsWidgetMacModule)
		#elif defined(XP_BEOS)
		# define WIDGET_MODULES MODULE(nsWidgetBeOSModule)
		#elif defined(XP_OS2)
		# define WIDGET_MODULES MODULE(nsWidgetOS2Module)
		#elif defined(MOZ_WIDGET_GTK)
		# define WIDGET_MODULES MODULE(nsWidgetGTKModule)
		#endif
		#ifdef MOZ_WIDGET_GTK2
		#elif defined(MOZ_WIDGET_GTK2)
		# define WIDGET_MODULES MODULE(nsWidgetGtk2Module)
		#endif
		#ifdef MOZ_WIDGET_XLIB
		#elif defined(MOZ_WIDGET_XLIB)
		# define WIDGET_MODULES MODULE(nsWidgetXLIBModule)
		#endif
		#ifdef MOZ_WIDGET_PHOTON
		#elif defined(MOZ_WIDGET_PHOTON)
		# define WIDGET_MODULES MODULE(nsWidgetPhModule)
		#endif
		#ifdef MOZ_WIDGET_QT
		#elif defined(MOZ_WIDGET_QT)
		# define WIDGET_MODULES MODULE(nsWidgetQtModule)
		#else
		# error Unknown widget module.
		#endif

		#ifdef ICON_DECODER
		#define ICON_MODULE MODULE(nsIconDecoderModule)
		#else
		#define ICON_MODULE
		#endif

		#ifdef MOZ_ENABLE_XPRINT