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

bug 553635 - link libimgicon into libxul in gtk builds. r=bsmedberg

Browse Source
This commit is contained in:
Ted Mielczarek 2010-03-20 12:14:15 -04:00
parent 1803574d29
commit 8f38c0f6dc
6 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
browser/installer/package-manifest.in
View File

@ -189,11 +189,6 @@
#endif
@BINPATH@/components/layout_xul_tree.xpt
@BINPATH@/components/layout_xul.xpt
#ifdef XP_UNIX
#ifndef XP_MACOSX
@BINPATH@/components/libimgicon@DLL_SUFFIX@
#endif
#endif
@BINPATH@/components/locale.xpt
@BINPATH@/components/lwbrk.xpt
#ifndef WINCE

5
browser/installer/removed-files.in
View File

@ -843,3 +843,8 @@ components/nsUpdateServiceStub.js
old-homepage-default.properties
components/microsummaries.xpt
LICENSE
#ifdef XP_UNIX
#ifndef XP_MACOSX
components/libimgicon.so
#endif
#endif

2
modules/libpr0n/decoders/Makefile.in
View File

@ -44,7 +44,7 @@ include $(DEPTH)/config/autoconf.mk
ifneq (,$(filter icon,$(MOZ_IMG_DECODERS)))
ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
TOOL_DIRS = icon/gtk icon
DIRS = icon/gtk icon
endif
ifneq (,$(filter qt,$(MOZ_WIDGET_TOOLKIT)))
DIRS = icon/qt icon

13
modules/libpr0n/decoders/icon/Makefile.in
View File

@ -46,14 +46,12 @@ MODULE = imgicon
LIBRARY_NAME = imgicon
IS_COMPONENT = 1
MODULE_NAME = nsIconDecoderModule
LIBXUL_LIBRARY = 1
EXPORT_LIBRARY = 1
ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
EXTRA_DSO_LDOPTS = $(MOZ_GTK2_LIBS)
PLATFORM = gtk
FORCE_SHARED_LIB = 1
else
LIBXUL_LIBRARY = 1
EXPORT_LIBRARY = 1
endif
ifneq (,$(filter qt,$(MOZ_WIDGET_TOOLKIT)))
@ -101,17 +99,10 @@ XPIDLSRCS = nsIIconURI.idl
SHARED_LIBRARY_LIBS = $(PLATFORM)/$(LIB_PREFIX)imgicon$(PLATFORM)_s.$(LIB_SUFFIX)
ifdef LIBXUL_LIBRARY
EXTRA_DSO_LDOPTS += \
$(EXTRA_DSO_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(NULL)
else
EXTRA_DSO_LDOPTS += \
$(XPCOM_GLUE_LDOPTS) \
$(NSPR_LIBS) \
$(NULL)
endif
LOCAL_INCLUDES = -I$(srcdir)/$(PLATFORM)

2
modules/libpr0n/decoders/icon/gtk/Makefile.in
View File

@ -44,7 +44,7 @@ include $(DEPTH)/config/autoconf.mk
MODULE = imgicon
LIBRARY_NAME = imgicongtk_s
LIBXUL_LIBRARY = 1
CPPSRCS = nsIconChannel.cpp

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

@ -302,11 +302,9 @@ STATIC_LIBS += gfxpsshar
endif
ifneq (,$(filter icon,$(MOZ_IMG_DECODERS)))
ifndef MOZ_ENABLE_GTK2
DEFINES += -DICON_DECODER
COMPONENT_LIBS += imgicon
endif
endif
STATIC_LIBS += thebes layers
COMPONENT_LIBS += gkgfxthebes