Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 320316 - libxul doesn't link with cairo toolkits (thebes) r=vlad; don't build mfcembed if xpcomobsolete (nsIRegistry) isn't available, to fix xulrunner windows bustage

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@193612 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
benjamin%smedbergs.us
2006-04-05 19:25:57 +00:00
parent a91e8519f5
commit 9580da1e9a
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/toolkit/library/Makefile.in
View File

@@ -157,7 +157,7 @@ EXTRA_DSO_LDOPTS += -lbe -ltracker
endif
ifeq ($(OS_ARCH),WINNT)
EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME,shell32 ole32 uuid version winspool comdlg32)
EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME,shell32 ole32 uuid version winspool comdlg32 imm32)
ifneq (,$(MOZ_DEBUG)$(NS_TRACE_MALLOC))
EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME,imagehlp)
endif

2
mozilla/toolkit/library/libxul-config.mk
View File

@@ -198,7 +198,9 @@ endif
endif
ifdef MOZ_ENABLE_CAIRO_GFX
STATIC_LIBS += thebes
COMPONENT_LIBS += gkgfxthebes
else # Platform-specific GFX layer
ifeq (windows,$(MOZ_GFX_TOOLKIT))
COMPONENT_LIBS += gkgfxwin