openharmony/third_party_libsnd
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_libsnd synced 2024-11-23 09:59:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Apply patch from Trent Apted make it compile on Intel MacOSX.

Browse Source
This commit is contained in:
Erik de Castro Lopo 2007-06-07 21:03:03 +10:00
parent 8a77df05d6
commit 10177412f3
4 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -3,6 +3,9 @@
* doc/FAQ.html
Minor update.
* configure.ac src/FLAC/src/libFLAC/ia32/Makefile.am src/Makefile.am
Apply patch from Trent Apted make it compile on Intel MacOSX. Thanks Trent.
2007-05-28 Erik de Castro Lopo <erikd AT mega-nerd DOT com>
* src/wav.c

18
configure.ac
View File

@ -370,12 +370,24 @@ if test "$AS" = "gas" ; then
fi
case "$host" in
i386-*-openbsd3.[[0-3]]) OBJ_FORMAT=aoutb ;;
*-*-cygwin|*mingw*) OBJ_FORMAT=win32 ;;
*) OBJ_FORMAT=elf ;;
i386-*-openbsd3.[[0-3]])
OBJ_FORMAT=aoutb
;;
*-*-cygwin|*mingw*)
OBJ_FORMAT=win32
;;
i*86-apple-darwin*)
OBJ_FORMAT=macho
NASM_FLAGS="-DFLAC__PUBLIC_NEEDS_UNDERSCORE"
OS_SPECIFIC_LIBLINKS="-Wl,-read_only_relocs -Wl,suppress"
;;
*)
OBJ_FORMAT=elf ;;
esac
AC_SUBST(OBJ_FORMAT)
AC_SUBST(NASM_FLAGS)
AC_SUBST(OS_SPECIFIC_LIBLINKS)
#====================================================================================
# Target OS specific stuff.

2
src/FLAC/src/libFLAC/ia32/Makefile.am
View File

@ -33,7 +33,7 @@ SUFFIXES = .nasm .lo
STRIP_NON_ASM = sh $(top_srcdir)/src/FLAC/strip_non_asm_libtool_args.sh
.nasm.lo:
$(LIBTOOL) --tag=CC --mode=compile $(STRIP_NON_ASM) $(NASM) -f $(OBJ_FORMAT) -d OBJ_FORMAT_$(OBJ_FORMAT) -i$(srcdir)/ $< -o $@
$(LIBTOOL) --tag=CC --mode=compile $(STRIP_NON_ASM) $(NASM) $(NASM_FLAGS) -f $(OBJ_FORMAT) -d OBJ_FORMAT_$(OBJ_FORMAT) -i$(srcdir)/ $< -o $@
noinst_LTLIBRARIES = libFLAC-asm.la
libFLAC_asm_la_SOURCES = \

2
src/Makefile.am
View File

@ -29,7 +29,7 @@ FILESPECIFIC = sndfile.c aiff.c au.c avr.c caf.c dwd.c flac.c g72x.c htk.c ircam
sds.c svx.c txw.c voc.c wve.c w64.c wav_w64.c wav.c xi.c
# MinGW requires -no-undefined if a DLL is to be built.
libsndfile_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@ @SHLIB_VERSION_ARG@
libsndfile_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@ @SHLIB_VERSION_ARG@ @OS_SPECIFIC_LIBLINKS@
libsndfile_la_SOURCES = $(FILESPECIFIC) $(noinst_HEADERS)
nodist_libsndfile_la_SOURCES = $(nodist_include_HEADERS)
libsndfile_la_LIBADD = libcommon.la FLAC/src/libFLAC/libFLAC.la GSM610/libgsm.la \