diff --git a/b2g/installer/package-manifest.in b/b2g/installer/package-manifest.in index dad20310e99..3c083ea8794 100644 --- a/b2g/installer/package-manifest.in +++ b/b2g/installer/package-manifest.in @@ -54,6 +54,7 @@ @BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@ +@BINPATH@/@DLL_PREFIX@soundtouch@DLL_SUFFIX@ #ifdef XP_MACOSX @BINPATH@/XUL #else diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index aa25bbdd962..538c9893b57 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -54,6 +54,7 @@ @BINPATH@/@DLL_PREFIX@gkmedias@DLL_SUFFIX@ #endif @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@ +@BINPATH@/@DLL_PREFIX@soundtouch@DLL_SUFFIX@ #ifdef MOZ_SHARED_MOZGLUE @BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@ #endif diff --git a/configure.in b/configure.in index ace230b6f46..39d973b8fa7 100644 --- a/configure.in +++ b/configure.in @@ -5558,6 +5558,15 @@ if test -n "$MOZ_SOUNDTOUCH"; then AC_DEFINE(MOZ_SOUNDTOUCH) fi +if test -z "$GNU_CC" -a "$OS_ARCH" = "WINNT"; then + SOUNDTOUCH_LIBS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)soundtouch.$(LIB_SUFFIX)' +else + SOUNDTOUCH_LIBS='-lsoundtouch' +fi +AC_SUBST(SOUNDTOUCH_CFLAGS) +AC_SUBST(SOUNDTOUCH_LIBS) +AC_SUBST(SOUNDTOUCH_CONFIG) + if test -n "$MOZ_CUBEB"; then case "$target" in *-android*|*-linuxandroid*) diff --git a/layout/media/Makefile.in b/layout/media/Makefile.in index a23567a6551..46c9c7949b7 100644 --- a/layout/media/Makefile.in +++ b/layout/media/Makefile.in @@ -87,12 +87,6 @@ SHARED_LIBRARY_LIBS += \ $(NULL) endif -ifdef MOZ_SOUNDTOUCH -SHARED_LIBRARY_LIBS += \ - $(DEPTH)/media/libsoundtouch/src/$(LIB_PREFIX)soundtouch.$(LIB_SUFFIX) \ - $(NULL) -endif - ifdef MOZ_CUBEB SHARED_LIBRARY_LIBS += \ $(DEPTH)/media/libcubeb/src/$(LIB_PREFIX)cubeb.$(LIB_SUFFIX) \ diff --git a/media/libsoundtouch/src/Makefile.in b/media/libsoundtouch/src/Makefile.in index 4ddaa25332c..2d584ee8ff3 100644 --- a/media/libsoundtouch/src/Makefile.in +++ b/media/libsoundtouch/src/Makefile.in @@ -12,9 +12,18 @@ include $(DEPTH)/config/autoconf.mk MODULE = soundtouch LIBRARY_NAME = soundtouch SHORT_LIBNAME = soundt +FORCE_SHARED_LIB = 1 VISIBILITY_FLAGS = EXPORTS_NAMESPACES = soundtouch +ifeq ($(OS_ARCH),WINNT) +ifndef GNU_CC +RCFILE = soundtouch.rc +RESFILE = soundtouch.res +endif +endif + + EXTRA_DSO_LDOPTS += $(MOZALLOC_LIB) # Use abort() instead of exception in SoundTouch. @@ -43,6 +52,8 @@ CPPSRCS += mmx_optimized.cpp endif endif +SOUNDTOUCH_LIBS = $(DLL_PREFIX)soundtouch$(DLL_SUFFIX) + include $(topsrcdir)/config/rules.mk ifneq (,$(INTEL_ARCHITECTURE)) diff --git a/media/libsoundtouch/src/soundtouch.rc b/media/libsoundtouch/src/soundtouch.rc new file mode 100644 index 00000000000..313039b14bf --- /dev/null +++ b/media/libsoundtouch/src/soundtouch.rc @@ -0,0 +1,53 @@ + +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this +// file, You can obtain one at http://mozilla.org/MPL/2.0/. + +#include + +// Note: if you contain versioning information in an included +// RC script, it will be discarded +// Use module.ver to explicitly set these values + +// Do not edit this file. Changes won't affect the build. + + + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// +VS_VERSION_INFO VERSIONINFO + FILEVERSION 1,7,0,0 + PRODUCTVERSION 1,7,0,0 + FILEFLAGSMASK 0x17L +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "000004b0" + BEGIN + VALUE "Comments", "SoundTouch Library licensed for 3rd party applications subject to LGPL license v2.1. Visit http://www.surina.net/soundtouch for more information about the SoundTouch library." + VALUE "FileDescription", "SoundTouch Dynamic Link Library" + VALUE "FileVersion", "1, 7, 0, 0" + VALUE "InternalName", "SoundTouch" + VALUE "LegalCopyright", "Copyright (C) Olli Parviainen 1999-2012" + VALUE "OriginalFilename", "SoundTouch.dll" + VALUE "ProductName", " SoundTouch Dynamic Link Library" + VALUE "ProductVersion", "1, 7, 0, 0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0, 1200 + END +END + diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in index 95523cf8000..557f78452a1 100644 --- a/mobile/android/installer/package-manifest.in +++ b/mobile/android/installer/package-manifest.in @@ -40,6 +40,7 @@ @BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@ +@BINPATH@/@DLL_PREFIX@soundtouch@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@omxplugin@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@xul@DLL_SUFFIX@ diff --git a/mobile/xul/installer/package-manifest.in b/mobile/xul/installer/package-manifest.in index e0dac86393f..c4d01f0dc5e 100644 --- a/mobile/xul/installer/package-manifest.in +++ b/mobile/xul/installer/package-manifest.in @@ -51,6 +51,7 @@ @BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@ +@BINPATH@/@DLL_PREFIX@soundtouch@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@omxplugin@DLL_SUFFIX@ #ifdef XP_MACOSX diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in index 049bcd6c3ba..bf4eced9da7 100644 --- a/toolkit/library/Makefile.in +++ b/toolkit/library/Makefile.in @@ -364,6 +364,7 @@ EXTRA_DSO_LDOPTS += \ $(MOZ_CAIRO_OSLIBS) \ $(MOZ_APP_EXTRA_LIBS) \ $(SQLITE_LIBS) \ + $(SOUNDTOUCH_LIBS) \ $(NULL) ifdef MOZ_NATIVE_JPEG diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk index 62f0efff6e6..8c6409636c6 100644 --- a/toolkit/mozapps/installer/packager.mk +++ b/toolkit/mozapps/installer/packager.mk @@ -266,6 +266,7 @@ DIST_FILES += \ libplc4.so \ libplds4.so \ libmozsqlite3.so \ + libsoundtouch.so \ libnssutil3.so \ libnss3.so \ libssl3.so \