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 779997 - Backout e35029dcac2d to enable libsoundtouch again.

Browse Source
This commit is contained in:
Paul Adenot 2012-11-22 11:38:28 +01:00
parent eb88be58b6
commit 3c2724d53c
9 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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

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

@ -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

1
config/system-headers
View File

@ -982,6 +982,7 @@ plarenas.h
plarena.h
plhash.h
speex/speex_resampler.h
soundtouch/SoundTouch.h
#if MOZ_NATIVE_PNG==1
png.h
#endif

15
configure.in
View File

@ -4193,6 +4193,7 @@ MOZ_OGG=1
MOZ_RAW=
MOZ_SYDNEYAUDIO=
MOZ_SPEEX_RESAMPLER=1
MOZ_SOUNDTOUCH=1
MOZ_CUBEB=
MOZ_VORBIS=
MOZ_TREMOR=
@ -5552,6 +5553,19 @@ if test -n "$MOZ_SPEEX_RESAMPLER"; then
AC_DEFINE(MOZ_SPEEX_RESAMPLER)
fi
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*)
@ -8605,6 +8619,7 @@ AC_SUBST(MOZ_APP_EXTRA_LIBS)
AC_SUBST(MOZ_MEDIA)
AC_SUBST(MOZ_SYDNEYAUDIO)
AC_SUBST(MOZ_SPEEX_RESAMPLER)
AC_SUBST(MOZ_SOUNDTOUCH)
AC_SUBST(MOZ_CUBEB)
AC_SUBST(MOZ_WAVE)
AC_SUBST(MOZ_VORBIS)

1
js/src/config/system-headers
View File

@ -982,6 +982,7 @@ plarenas.h
plarena.h
plhash.h
speex/speex_resampler.h
soundtouch/SoundTouch.h
#if MOZ_NATIVE_PNG==1
png.h
#endif

1
toolkit/library/Makefile.in
View File

@ -364,6 +364,7 @@ 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,6 +266,7 @@ DIST_FILES += \
libplc4.so \
libplds4.so \
libmozsqlite3.so \
libsoundtouch.so \
libnssutil3.so \
libnss3.so \
libssl3.so \

7
toolkit/toolkit-makefiles.sh
View File

@ -1729,3 +1729,10 @@ if [ "$MOZ_SPEEX_RESAMPLER" ]; then
"
fi
if [ "$MOZ_SOUNDTOUCH" ]; then
add_makefiles "
media/libsoundtouch/Makefile
media/libsoundtouch/src/Makefile
"
fi

6
toolkit/toolkit-tiers.mk
View File

@ -151,6 +151,12 @@ tier_platform_dirs += \
$(NULL)
endif
ifdef MOZ_SOUNDTOUCH
tier_platform_dirs += \
media/libsoundtouch \
$(NULL)
endif
ifdef MOZ_CUBEB
tier_platform_dirs += \
media/libcubeb \