wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 816576 - Link libsoundtouch statically instead of dynamically. r=glandium

Browse Source
This commit is contained in:
Paul Adenot 2012-11-30 10:56:28 +01:00
parent b078ecf2ae
commit 37dd124761
10 changed files with 6 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
b2g/installer/package-manifest.in
View File

@ -54,7 +54,6 @@
@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

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

@ -54,7 +54,6 @@
@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

9
configure.in
View File

@ -5558,15 +5558,6 @@ 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*)

6
layout/media/Makefile.in
View File

@ -87,6 +87,12 @@ 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) \

11
media/libsoundtouch/src/Makefile.in
View File

@ -12,18 +12,9 @@ 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.
@ -52,8 +43,6 @@ CPPSRCS += mmx_optimized.cpp
endif
endif
SOUNDTOUCH_LIBS = $(DLL_PREFIX)soundtouch$(DLL_SUFFIX)
include $(topsrcdir)/config/rules.mk
ifneq (,$(INTEL_ARCHITECTURE))

53
media/libsoundtouch/src/soundtouch.rc
View File

@ -1,53 +0,0 @@
// 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<winver.h>
// 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

1
mobile/android/installer/package-manifest.in
View File

@ -40,7 +40,6 @@
@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@

1
mobile/xul/installer/package-manifest.in
View File

@ -51,7 +51,6 @@
@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

1
toolkit/library/Makefile.in
View File

@ -364,7 +364,6 @@ EXTRA_DSO_LDOPTS += \
$(MOZ_CAIRO_OSLIBS) \
$(MOZ_APP_EXTRA_LIBS) \
$(SQLITE_LIBS) \
$(SOUNDTOUCH_LIBS) \
$(NULL)
ifdef MOZ_NATIVE_JPEG

1
toolkit/mozapps/installer/packager.mk
View File

@ -266,7 +266,6 @@ DIST_FILES += \
libplc4.so \
libplds4.so \
libmozsqlite3.so \
libsoundtouch.so \
libnssutil3.so \
libnss3.so \
libssl3.so \