18997N/A--- comm-1.9.2/mozilla/layout/build/Makefile.in.old6 2010-09-08 13:35:41.025368649 +0800
18997N/A+++ comm-1.9.2/mozilla/layout/build/Makefile.in 2010-09-08 13:37:08.067027107 +0800
18997N/A@@ -152,11 +152,8 @@
18997N/A ifdef MOZ_OGG
18997N/A SHARED_LIBRARY_LIBS += \
18997N/A $(DEPTH)/media/libfishsound/src/libfishsound/$(LIB_PREFIX)fishsound.$(LIB_SUFFIX) \
18997N/A- $(DEPTH)/media/libogg/src/$(LIB_PREFIX)ogg.$(LIB_SUFFIX) \
18997N/A $(DEPTH)/media/liboggplay/src/liboggplay/$(LIB_PREFIX)oggplay.$(LIB_SUFFIX) \
18997N/A $(DEPTH)/media/liboggz/src/liboggz/$(LIB_PREFIX)oggz.$(LIB_SUFFIX) \
18997N/A- $(DEPTH)/media/libtheora/lib/$(LIB_PREFIX)theora.$(LIB_SUFFIX) \
18997N/A- $(DEPTH)/media/libvorbis/lib/$(LIB_PREFIX)vorbis.$(LIB_SUFFIX) \
18997N/A $(DEPTH)/content/media/ogg/$(LIB_PREFIX)gkconogg_s.$(LIB_SUFFIX) \
18997N/A $(NULL)
18997N/A endif
18997N/A--- comm-1.9.2/mozilla/toolkit/toolkit-tiers.mk.old6 2010-09-08 13:36:35.506386081 +0800
18997N/A+++ comm-1.9.2/mozilla/toolkit/toolkit-tiers.mk 2010-09-08 13:37:08.067673746 +0800
18997N/A@@ -93,9 +93,9 @@
18997N/A
18997N/A ifdef BUILD_CTYPES
18997N/A ifndef _MSC_VER
18997N/A-tier_gecko_staticdirs += \
18997N/A- js/ctypes/libffi \
18997N/A- $(NULL)
18997N/A+#tier_gecko_staticdirs += \
18997N/A+# js/ctypes/libffi \
18997N/A+# $(NULL)
18997N/A endif
18997N/A endif
18997N/A
18997N/A@@ -133,11 +133,8 @@
18997N/A ifdef MOZ_OGG
18997N/A tier_gecko_dirs += \
18997N/A media/libfishsound \
18997N/A- media/libogg \
18997N/A media/liboggplay \
18997N/A media/liboggz \
18997N/A- media/libtheora \
18997N/A- media/libvorbis \
18997N/A $(NULL)
18997N/A endif
18997N/A
18997N/A--- comm-1.9.2/mozilla/toolkit/library/Makefile.in.old6 2010-09-08 13:36:03.633681086 +0800
18997N/A+++ comm-1.9.2/mozilla/toolkit/library/Makefile.in 2010-09-08 13:37:08.067395922 +0800
18997N/A@@ -253,7 +253,7 @@
18997N/A endif
18997N/A
18997N/A ifeq ($(OS_ARCH),SunOS)
18997N/A-EXTRA_DSO_LDOPTS += -lelf -ldemangle -lCstd
18997N/A+EXTRA_DSO_LDOPTS += -lvorbis -ltheora -logg -lelf -ldemangle -lCstd `pkg-config --libs libffi`
18997N/A endif
18997N/A
18997N/A ifeq ($(OS_ARCH),AIX)
18997N/A--- comm-1.9.2/mail/app/Makefile.in.old6 2010-09-08 13:35:10.566993576 +0800
18997N/A+++ comm-1.9.2/mail/app/Makefile.in 2010-09-08 13:37:08.066732720 +0800
18930N/A@@ -130,7 +130,18 @@
16846N/A $(STATIC_COMPONENTS_LINKER_PATH) \
16846N/A $(MOZ_JS_LIBS) \
16846N/A $(EXTRA_DSO_LIBS) \
16846N/A- $(APP_XPCOM_LIBS) \
18930N/A+ $(APP_XPCOM_LIBS)
16846N/A+
16846N/A+ifdef BUILD_STATIC_LIBS
16846N/A+ifdef MOZ_STORAGE
16846N/A+ifeq ($(OS_ARCH),SunOS)
16846N/A+LIBS += \
16846N/A+ $(SQLITE_LIBS)
16846N/A+endif
16846N/A+endif
16846N/A+endif
16846N/A+
16846N/A+LIBS += \
16846N/A $(NSPR_LIBS) \
16846N/A $(TK_LIBS) \
16846N/A $(NULL)
18930N/A@@ -212,6 +223,12 @@
16846N/A endif
16846N/A endif
18930N/A
16846N/A+ifeq ($(OS_ARCH),SunOS)
16846N/A+ifdef BUILD_STATIC_LIBS
18930N/A+OS_LIBS += -lvorbis -ltheora -logg -lpixman-1 `pkg-config --libs libffi`
16846N/A+endif
16846N/A+endif
18930N/A+
16846N/A ifeq ($(OS_ARCH),BeOS)
16846N/A ifdef BUILD_STATIC_LIBS
18930N/A OS_LIBS += -ltracker -lgame