Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bstage fix from bug 273876 - incorporate psshared and fix the #ifdefs for gcc (apparently it doesn't do == the same way as MSVC?)

Browse Source
This commit is contained in:
bsmedberg%covad.net 2004-12-10 18:15:15 +00:00
parent f6d769bd98
commit 97e37f778b
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
toolkit/library/Makefile.in
View File

@ -153,12 +153,15 @@ endif
ifdef MOZ_ENABLE_POSTSCRIPT
DEFINES += -DMOZ_ENABLE_POSTSCRIPT
STATIC_LIBS += gfxpsshar
COMPONENT_LIBS += gfxps
endif
ifneq (,$(filter icon,$(MOZ_IMG_DECODERS)))
ifndef MOZ_ENABLE_GNOMEUI
DEFINES += -DICON_DECODER
COMPONENT_LIBS += imgicon
endif
endif
ifeq (windows,$(MOZ_WIDGET_TOOLKIT))
COMPONENT_LIBS += gkgfxwin gkwidget
endif
@ -250,6 +253,16 @@ CXXFLAGS += $(TK_CFLAGS)
EXTRA_DSO_LDOPTS += $(TK_LIBS)
endif
ifdef MOZ_ENABLE_XINERAMA
EXTRA_DSO_LDOPTS += $(MOZ_XINERAMA_LIBS)
endif
EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_GTK_LDFLAGS) $(MOZ_XFT_LIBS) $(MOZ_GTK2_LIBS)
ifdef MOZ_ENABLE_XPRINT
EXTRA_DSO_LDOPTS += $(MOZ_XPRINT_LDFLAGS)
endif
ifeq ($(OS_ARCH),BeOS)
EXTRA_DSO_LDOPTS += -lbe
endif

8
toolkit/library/nsStaticXULComponents.cpp
View File

@ -75,16 +75,16 @@
#define POSTSCRIPT_MODULES
#endif
#if MOZ_WIDGET_TOOLKIT==windows
#ifdef XP_WIN
# define GFX_MODULES MODULE(nsGfxModule)
# define WIDGET_MODULES MODULE(nsWidgetModule)
#elif MOZ_WIDGET_TOOLKIT==mac || MOZ_WIDGET_TOOLKIT=cocoa
#elif defined(XP_MACOSX)
# define GFX_MODULES MODULE(nsGfxMacModule)
# define WIDGET_MODULES MODULE(nsWidgetMacModule)
#elif MOZ_WIDGET_TOOLKIT==beos
#elif defined(XP_BEOS)
# define GFX_MODULES MODULE(nsGfxBeOSModule)
# define WIDGET_MODULES MODULE(nsWidgetBeOSModule)
#elif MOZ_WIDGET_TOOLKIT==os2
#elif defined(XP_OS2)
# define GFX_MODULES MODULE(nsGfxOS2Module)
# define WIDGET_MODULES MODULE(nsWidgetOS2Module)
#endif