mirror of
https://github.com/cookiengineer/audacity
synced 2025-11-27 15:50:10 +01:00
Upgraded flac to 1.3.1
This commit is contained in:
Leland Lucius
@@ -1,6 +1,6 @@
|
||||
# FLAC - Free Lossless Audio Codec
|
||||
# Copyright (C) 2002-2009 Josh Coalson
|
||||
# Copyright (C) 2011-2013 Xiph.Org Foundation
|
||||
# Copyright (C) 2011-2014 Xiph.Org Foundation
|
||||
#
|
||||
# This file is part the FLAC project. FLAC is comprised of several
|
||||
# components distributed under different licenses. The codec libraries
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
# Makefile.in generated by automake 1.11.6 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.14.1 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
||||
# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
|
||||
# Foundation, Inc.
|
||||
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
|
||||
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
# with or without modifications, as long as this notice is preserved.
|
||||
@@ -17,7 +16,7 @@
|
||||
|
||||
# FLAC - Free Lossless Audio Codec
|
||||
# Copyright (C) 2002-2009 Josh Coalson
|
||||
# Copyright (C) 2011-2013 Xiph.Org Foundation
|
||||
# Copyright (C) 2011-2014 Xiph.Org Foundation
|
||||
#
|
||||
# This file is part the FLAC project. FLAC is comprised of several
|
||||
# components distributed under different licenses. The codec libraries
|
||||
@@ -33,23 +32,51 @@
|
||||
# restrictive of those mentioned above. See the file COPYING.Xiph in this
|
||||
# distribution.
|
||||
VPATH = @srcdir@
|
||||
am__make_dryrun = \
|
||||
{ \
|
||||
am__dry=no; \
|
||||
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
|
||||
am__make_running_with_option = \
|
||||
case $${target_option-} in \
|
||||
?) ;; \
|
||||
*) echo "am__make_running_with_option: internal error: invalid" \
|
||||
"target option '$${target_option-}' specified" >&2; \
|
||||
exit 1;; \
|
||||
esac; \
|
||||
has_opt=no; \
|
||||
sane_makeflags=$$MAKEFLAGS; \
|
||||
if $(am__is_gnu_make); then \
|
||||
sane_makeflags=$$MFLAGS; \
|
||||
else \
|
||||
case $$MAKEFLAGS in \
|
||||
*\\[\ \ ]*) \
|
||||
echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
|
||||
| grep '^AM OK$$' >/dev/null || am__dry=yes;; \
|
||||
*) \
|
||||
for am__flg in $$MAKEFLAGS; do \
|
||||
case $$am__flg in \
|
||||
*=*|--*) ;; \
|
||||
*n*) am__dry=yes; break;; \
|
||||
esac; \
|
||||
done;; \
|
||||
bs=\\; \
|
||||
sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
|
||||
| sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
|
||||
esac; \
|
||||
test $$am__dry = yes; \
|
||||
}
|
||||
fi; \
|
||||
skip_next=no; \
|
||||
strip_trailopt () \
|
||||
{ \
|
||||
flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
|
||||
}; \
|
||||
for flg in $$sane_makeflags; do \
|
||||
test $$skip_next = yes && { skip_next=no; continue; }; \
|
||||
case $$flg in \
|
||||
*=*|--*) continue;; \
|
||||
-*I) strip_trailopt 'I'; skip_next=yes;; \
|
||||
-*I?*) strip_trailopt 'I';; \
|
||||
-*O) strip_trailopt 'O'; skip_next=yes;; \
|
||||
-*O?*) strip_trailopt 'O';; \
|
||||
-*l) strip_trailopt 'l'; skip_next=yes;; \
|
||||
-*l?*) strip_trailopt 'l';; \
|
||||
-[dEDm]) skip_next=yes;; \
|
||||
-[JT]) skip_next=yes;; \
|
||||
esac; \
|
||||
case $$flg in \
|
||||
*$$target_option*) has_opt=yes; break;; \
|
||||
esac; \
|
||||
done; \
|
||||
test $$has_opt = yes
|
||||
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
|
||||
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
|
||||
pkgdatadir = $(datadir)/@PACKAGE@
|
||||
pkgincludedir = $(includedir)/@PACKAGE@
|
||||
pkglibdir = $(libdir)/@PACKAGE@
|
||||
@@ -69,29 +96,37 @@ POST_UNINSTALL = :
|
||||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
subdir = build
|
||||
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
|
||||
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \
|
||||
$(top_srcdir)/m4/bswap.m4 $(top_srcdir)/m4/codeset.m4 \
|
||||
$(top_srcdir)/m4/add_cxxflags.m4 $(top_srcdir)/m4/bswap.m4 \
|
||||
$(top_srcdir)/m4/clang.m4 $(top_srcdir)/m4/codeset.m4 \
|
||||
$(top_srcdir)/m4/gcc_version.m4 $(top_srcdir)/m4/iconv.m4 \
|
||||
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
|
||||
$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
|
||||
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
|
||||
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
|
||||
$(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/stack_protect.m4 \
|
||||
$(top_srcdir)/m4/xmms.m4 $(top_srcdir)/configure.ac
|
||||
$(top_srcdir)/m4/ogg.m4 $(top_srcdir)/m4/really_gcc.m4 \
|
||||
$(top_srcdir)/m4/stack_protect.m4 $(top_srcdir)/m4/xmms.m4 \
|
||||
$(top_srcdir)/configure.ac
|
||||
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
||||
$(ACLOCAL_M4)
|
||||
mkinstalldirs = $(install_sh) -d
|
||||
CONFIG_HEADER = $(top_builddir)/config.h
|
||||
CONFIG_CLEAN_FILES =
|
||||
CONFIG_CLEAN_VPATH_FILES =
|
||||
AM_V_P = $(am__v_P_@AM_V@)
|
||||
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
|
||||
am__v_P_0 = false
|
||||
am__v_P_1 = :
|
||||
AM_V_GEN = $(am__v_GEN_@AM_V@)
|
||||
am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
|
||||
am__v_GEN_0 = @echo " GEN " $@;
|
||||
am__v_GEN_0 = @echo " GEN " $@;
|
||||
am__v_GEN_1 =
|
||||
AM_V_at = $(am__v_at_@AM_V@)
|
||||
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
|
||||
am__v_at_0 = @
|
||||
am__v_at_1 =
|
||||
SOURCES =
|
||||
DIST_SOURCES =
|
||||
am__can_run_installinfo = \
|
||||
@@ -99,6 +134,7 @@ am__can_run_installinfo = \
|
||||
n|no|NO) false;; \
|
||||
*) (install-info --version) >/dev/null 2>&1;; \
|
||||
esac
|
||||
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
ACLOCAL = @ACLOCAL@
|
||||
AMTAR = @AMTAR@
|
||||
@@ -137,7 +173,6 @@ EXEEXT = @EXEEXT@
|
||||
FGREP = @FGREP@
|
||||
FLAC__TEST_LEVEL = @FLAC__TEST_LEVEL@
|
||||
FLAC__TEST_WITH_VALGRIND = @FLAC__TEST_WITH_VALGRIND@
|
||||
GAS = @GAS@
|
||||
GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@
|
||||
GCC_MINOR_VERSION = @GCC_MINOR_VERSION@
|
||||
GCC_VERSION = @GCC_VERSION@
|
||||
@@ -157,8 +192,6 @@ LIPO = @LIPO@
|
||||
LN_S = @LN_S@
|
||||
LTLIBICONV = @LTLIBICONV@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
LT_NO_UNDEFINED = @LT_NO_UNDEFINED@
|
||||
MAINT = @MAINT@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MANIFEST_TOOL = @MANIFEST_TOOL@
|
||||
MKDIR_P = @MKDIR_P@
|
||||
@@ -260,7 +293,7 @@ EXTRA_DIST = \
|
||||
all: all-am
|
||||
|
||||
.SUFFIXES:
|
||||
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
|
||||
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
|
||||
@for dep in $?; do \
|
||||
case '$(am__configure_deps)' in \
|
||||
*$$dep*) \
|
||||
@@ -285,9 +318,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
||||
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
|
||||
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
||||
|
||||
$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
|
||||
$(top_srcdir)/configure: $(am__configure_deps)
|
||||
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
||||
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
|
||||
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
|
||||
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
||||
$(am__aclocal_m4_deps):
|
||||
|
||||
@@ -296,11 +329,11 @@ mostlyclean-libtool:
|
||||
|
||||
clean-libtool:
|
||||
-rm -rf .libs _libs
|
||||
tags: TAGS
|
||||
TAGS:
|
||||
tags TAGS:
|
||||
|
||||
ctags: CTAGS
|
||||
CTAGS:
|
||||
ctags CTAGS:
|
||||
|
||||
cscope cscopelist:
|
||||
|
||||
|
||||
distdir: $(DISTFILES)
|
||||
@@ -436,15 +469,16 @@ uninstall-am:
|
||||
.MAKE: install-am install-strip
|
||||
|
||||
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
|
||||
distclean distclean-generic distclean-libtool distdir dvi \
|
||||
dvi-am html html-am info info-am install install-am \
|
||||
install-data install-data-am install-dvi install-dvi-am \
|
||||
install-exec install-exec-am install-html install-html-am \
|
||||
install-info install-info-am install-man install-pdf \
|
||||
install-pdf-am install-ps install-ps-am install-strip \
|
||||
installcheck installcheck-am installdirs maintainer-clean \
|
||||
maintainer-clean-generic mostlyclean mostlyclean-generic \
|
||||
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
|
||||
cscopelist-am ctags-am distclean distclean-generic \
|
||||
distclean-libtool distdir dvi dvi-am html html-am info info-am \
|
||||
install install-am install-data install-data-am install-dvi \
|
||||
install-dvi-am install-exec install-exec-am install-html \
|
||||
install-html-am install-info install-info-am install-man \
|
||||
install-pdf install-pdf-am install-ps install-ps-am \
|
||||
install-strip installcheck installcheck-am installdirs \
|
||||
maintainer-clean maintainer-clean-generic mostlyclean \
|
||||
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
|
||||
tags-am uninstall uninstall-am
|
||||
|
||||
|
||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# FLAC - Free Lossless Audio Codec
|
||||
# Copyright (C) 2001-2009 Josh Coalson
|
||||
# Copyright (C) 2011-2013 Xiph.Org Foundation
|
||||
# Copyright (C) 2011-2014 Xiph.Org Foundation
|
||||
#
|
||||
# This file is part the FLAC project. FLAC is comprised of several
|
||||
# components distributed under different licenses. The codec libraries
|
||||
@@ -23,36 +23,21 @@
|
||||
%.debug.o %.release.o : %.c
|
||||
$(CC) $(CFLAGS) -c $< -o $@
|
||||
%.debug.o %.release.o : %.cc
|
||||
$(CCC) $(CFLAGS) -c $< -o $@
|
||||
$(CCC) $(CXXFLAGS) -c $< -o $@
|
||||
%.debug.o %.release.o : %.cpp
|
||||
$(CCC) $(CFLAGS) -c $< -o $@
|
||||
$(CCC) $(CXXFLAGS) -c $< -o $@
|
||||
%.debug.pic.o %.release.pic.o : %.c
|
||||
$(CC) $(CFLAGS) -fPIC -DPIC -c $< -o $@
|
||||
$(CC) $(CFLAGS) $(F_PIC) -DPIC -c $< -o $@
|
||||
%.debug.pic.o %.release.pic.o : %.cc
|
||||
$(CCC) $(CFLAGS) -fPIC -DPIC -c $< -o $@
|
||||
$(CCC) $(CXXFLAGS) $(F_PIC) -DPIC -c $< -o $@
|
||||
%.debug.pic.o %.release.pic.o : %.cpp
|
||||
$(CCC) $(CFLAGS) -fPIC -DPIC -c $< -o $@
|
||||
$(CCC) $(CXXFLAGS) $(F_PIC) -DPIC -c $< -o $@
|
||||
%.debug.i %.release.i : %.c
|
||||
$(CC) $(CFLAGS) -E $< -o $@
|
||||
%.debug.i %.release.i : %.cc
|
||||
$(CCC) $(CFLAGS) -E $< -o $@
|
||||
$(CCC) $(CXXFLAGS) -E $< -o $@
|
||||
%.debug.i %.release.i : %.cpp
|
||||
$(CCC) $(CFLAGS) -E $< -o $@
|
||||
|
||||
%.debug.o %.release.o : %.s
|
||||
ifeq ($(OS),Darwin)
|
||||
#$(CC) -c -arch $(PROC) -Wall -force_cpusubtype_ALL $< -o $@
|
||||
$(AS) -arch $(PROC) -force_cpusubtype_ALL $< -o $@
|
||||
else
|
||||
$(AS) $< -o $@
|
||||
endif
|
||||
%.debug.pic.o %.release.pic.o : %.s
|
||||
ifeq ($(OS),Darwin)
|
||||
#$(CC) -c -arch $(PROC) -Wall -force_cpusubtype_ALL $< -o $@
|
||||
$(AS) -arch $(PROC) -force_cpusubtype_ALL $< -o $@
|
||||
else
|
||||
$(AS) $< -o $@
|
||||
endif
|
||||
$(CCC) $(CXXFLAGS) -E $< -o $@
|
||||
|
||||
%.debug.o : %.nasm
|
||||
$(NASM) -f elf -d OBJ_FORMAT_elf -i ia32/ -g $< -o $@
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# FLAC - Free Lossless Audio Codec
|
||||
# Copyright (C) 2001-2009 Josh Coalson
|
||||
# Copyright (C) 2011-2013 Xiph.Org Foundation
|
||||
# Copyright (C) 2011-2014 Xiph.Org Foundation
|
||||
#
|
||||
# This file is part the FLAC project. FLAC is comprised of several
|
||||
# components distributed under different licenses. The codec libraries
|
||||
@@ -22,6 +22,9 @@
|
||||
|
||||
USE_OGG ?= 1
|
||||
USE_ICONV ?= 1
|
||||
USE_LROUND ?= 1
|
||||
USE_FSEEKO ?= 1
|
||||
USE_LANGINFO_CODESET ?= 1
|
||||
|
||||
#
|
||||
# debug/release selection
|
||||
@@ -29,24 +32,25 @@ USE_ICONV ?= 1
|
||||
|
||||
DEFAULT_BUILD = release
|
||||
|
||||
F_PIC := -fPIC
|
||||
|
||||
# returns Linux, Darwin, FreeBSD, etc.
|
||||
ifdef OS_OVERRIDE
|
||||
OS := $(OS_OVERRIDE)
|
||||
else
|
||||
ifndef OS
|
||||
OS := $(shell uname -s)
|
||||
endif
|
||||
# returns i386, x86_64, powerpc, etc.
|
||||
ifdef PROC_OVERRIDE
|
||||
PROC := $(PROC_OVERRIDE)
|
||||
else
|
||||
ifeq ($(findstring MINGW,$(OS)),MINGW)
|
||||
ifndef PROC
|
||||
ifeq ($(findstring Windows,$(OS)),Windows)
|
||||
PROC := i386 # failsafe
|
||||
# ifeq (mingw32,$(shell gcc -dumpmachine)) # MinGW (mainline): mingw32
|
||||
ifeq ($(findstring i686,$(shell gcc -dumpmachine)),i686) # MinGW-w64: i686-w64-mingw32
|
||||
USE_ICONV := 0
|
||||
else ifeq ($(findstring x86_64,$(shell gcc -dumpmachine)),x86_64) # MinGW-w64: x86_64-w64-mingw32
|
||||
USE_ICONV := 0
|
||||
USE_ICONV := 0
|
||||
USE_LANGINFO_CODESET := 0
|
||||
ifeq (mingw32,$(shell gcc -dumpmachine)) # MinGW (mainline): mingw32
|
||||
USE_FSEEKO := 0
|
||||
endif
|
||||
# ifeq ($(findstring i686,$(shell gcc -dumpmachine)),i686) # MinGW-w64: i686-w64-mingw32
|
||||
ifeq ($(findstring x86_64,$(shell gcc -dumpmachine)),x86_64) # MinGW-w64: x86_64-w64-mingw32
|
||||
PROC := x86_64
|
||||
F_PIC :=
|
||||
endif
|
||||
else
|
||||
PROC := $(shell uname -p)
|
||||
@@ -80,9 +84,9 @@ all default: $(DEFAULT_BUILD)
|
||||
# GNU makefile fragment for emulating stuff normally done by configure
|
||||
#
|
||||
|
||||
VERSION=\"1.3.0\"
|
||||
VERSION=\"1.3.1\"
|
||||
|
||||
CONFIG_CFLAGS=-DHAVE_STDINT_H -DHAVE_INTTYPES_H -DHAVE_CXX_VARARRAYS -DHAVE_LANGINFO_CODESET -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
|
||||
CONFIG_CFLAGS=$(CUSTOM_CFLAGS) -DHAVE_STDINT_H -DHAVE_INTTYPES_H -DHAVE_CXX_VARARRAYS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
|
||||
|
||||
ifeq ($(OS),Darwin)
|
||||
CONFIG_CFLAGS += -DFLAC__SYS_DARWIN -arch $(PROC)
|
||||
@@ -91,9 +95,9 @@ else
|
||||
endif
|
||||
|
||||
ifeq ($(PROC),ppc)
|
||||
CONFIG_CFLAGS += -DWORDS_BIGENDIAN=1
|
||||
CONFIG_CFLAGS += -DWORDS_BIGENDIAN=1 -DCPU_IS_LITTLE_ENDIAN=0
|
||||
else
|
||||
CONFIG_CFLAGS += -DWORDS_BIGENDIAN=0
|
||||
CONFIG_CFLAGS += -DWORDS_BIGENDIAN=0 -DCPU_IS_LITTLE_ENDIAN=1
|
||||
endif
|
||||
|
||||
ifeq ($(OS),Linux)
|
||||
@@ -125,3 +129,15 @@ endif
|
||||
|
||||
OGG_INCLUDE_DIR=$(HOME)/local/include
|
||||
OGG_LIB_DIR=$(HOME)/local/lib
|
||||
|
||||
ifneq (0,$(USE_LROUND))
|
||||
CONFIG_CFLAGS += -DHAVE_LROUND
|
||||
endif
|
||||
|
||||
ifneq (0,$(USE_FSEEKO))
|
||||
CONFIG_CFLAGS += -DHAVE_FSEEKO
|
||||
endif
|
||||
|
||||
ifneq (0,$(USE_LANGINFO_CODESET))
|
||||
CONFIG_CFLAGS += -DHAVE_LANGINFO_CODESET
|
||||
endif
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# FLAC - Free Lossless Audio Codec
|
||||
# Copyright (C) 2001-2009 Josh Coalson
|
||||
# Copyright (C) 2011-2013 Xiph.Org Foundation
|
||||
# Copyright (C) 2011-2014 Xiph.Org Foundation
|
||||
#
|
||||
# This file is part the FLAC project. FLAC is comprised of several
|
||||
# components distributed under different licenses. The codec libraries
|
||||
@@ -42,17 +42,20 @@ PROGRAM = $(BINPATH)/$(PROGRAM_NAME)
|
||||
DEBUG_PROGRAM = $(DEBUG_BINPATH)/$(PROGRAM_NAME)
|
||||
RELEASE_PROGRAM = $(RELEASE_BINPATH)/$(PROGRAM_NAME)
|
||||
|
||||
debug : CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) $(DEBUG_CFLAGS) -W -Wall -Wmissing-prototypes -Wstrict-prototypes -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
|
||||
valgrind: CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) $(DEBUG_CFLAGS) -DFLAC__VALGRIND_TESTING -W -Wall -Wmissing-prototypes -Wstrict-prototypes -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
|
||||
release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -finline-functions -DNDEBUG $(CONFIG_CFLAGS) $(RELEASE_CFLAGS) -W -Wall -Wmissing-prototypes -Wstrict-prototypes -Winline -DFLaC__INLINE=__inline__ -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
|
||||
debug : CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) $(DEBUG_CFLAGS) -W -Wall -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
|
||||
valgrind: CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) $(DEBUG_CFLAGS) -DFLAC__VALGRIND_TESTING -W -Wall -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
|
||||
release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -finline-functions -DNDEBUG $(CONFIG_CFLAGS) $(RELEASE_CFLAGS) -W -Wall -Winline -DFLaC__INLINE=__inline__ -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
|
||||
|
||||
LFLAGS = -L$(LIBPATH)
|
||||
CFLAGS = $(CFLAGS) -Wmissing-prototypes -Wstrict-prototypes
|
||||
CXXFLAGS = $(CFLAGS)
|
||||
|
||||
DEBUG_OBJS = $(SRCS_C:%.c=%.debug.o) $(SRCS_CC:%.cc=%.debug.o) $(SRCS_CPP:%.cpp=%.debug.o) $(SRCS_NASM:%.nasm=%.debug.o) $(SRCS_S:%.s=%.debug.o)
|
||||
RELEASE_OBJS = $(SRCS_C:%.c=%.release.o) $(SRCS_CC:%.cc=%.release.o) $(SRCS_CPP:%.cpp=%.release.o) $(SRCS_NASM:%.nasm=%.release.o) $(SRCS_S:%.s=%.release.o)
|
||||
LFLAGS = -L$(LIBPATH)
|
||||
|
||||
DEBUG_OBJS = $(SRCS_C:%.c=%.debug.o) $(SRCS_CC:%.cc=%.debug.o) $(SRCS_CPP:%.cpp=%.debug.o) $(SRCS_NASM:%.nasm=%.debug.o)
|
||||
RELEASE_OBJS = $(SRCS_C:%.c=%.release.o) $(SRCS_CC:%.cc=%.release.o) $(SRCS_CPP:%.cpp=%.release.o) $(SRCS_NASM:%.nasm=%.release.o)
|
||||
ifeq ($(PROC),x86_64)
|
||||
DEBUG_PIC_OBJS = $(SRCS_C:%.c=%.debug.pic.o) $(SRCS_CC:%.cc=%.debug.pic.o) $(SRCS_CPP:%.cpp=%.debug.pic.o) $(SRCS_NASM:%.nasm=%.debug.pic.o) $(SRCS_S:%.s=%.debug.pic.o)
|
||||
RELEASE_PIC_OBJS = $(SRCS_C:%.c=%.release.pic.o) $(SRCS_CC:%.cc=%.release.pic.o) $(SRCS_CPP:%.cpp=%.release.pic.o) $(SRCS_NASM:%.nasm=%.release.pic.o) $(SRCS_S:%.s=%.release.pic.o)
|
||||
DEBUG_PIC_OBJS = $(SRCS_C:%.c=%.debug.pic.o) $(SRCS_CC:%.cc=%.debug.pic.o) $(SRCS_CPP:%.cpp=%.debug.pic.o) $(SRCS_NASM:%.nasm=%.debug.pic.o)
|
||||
RELEASE_PIC_OBJS = $(SRCS_C:%.c=%.release.pic.o) $(SRCS_CC:%.cc=%.release.pic.o) $(SRCS_CPP:%.cpp=%.release.pic.o) $(SRCS_NASM:%.nasm=%.release.pic.o)
|
||||
endif
|
||||
|
||||
debug : $(DEBUG_PROGRAM)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# FLAC - Free Lossless Audio Codec
|
||||
# Copyright (C) 2001-2009 Josh Coalson
|
||||
# Copyright (C) 2011-2013 Xiph.Org Foundation
|
||||
# Copyright (C) 2011-2014 Xiph.Org Foundation
|
||||
#
|
||||
# This file is part the FLAC project. FLAC is comprised of several
|
||||
# components distributed under different licenses. The codec libraries
|
||||
@@ -29,7 +29,6 @@ else
|
||||
CC = gcc
|
||||
CCC = g++
|
||||
endif
|
||||
AS = as
|
||||
NASM = nasm
|
||||
LINK = ar cru
|
||||
OBJPATH = $(topdir)/objs
|
||||
@@ -39,13 +38,15 @@ RELEASE_LIBPATH = $(OBJPATH)/release/lib
|
||||
ifeq ($(OS),Darwin)
|
||||
STATIC_LIB_SUFFIX = a
|
||||
DYNAMIC_LIB_SUFFIX = dylib
|
||||
else ifeq ($(findstring MINGW,$(OS)),MINGW)
|
||||
else
|
||||
ifeq ($(findstring Windows,$(OS)),Windows)
|
||||
STATIC_LIB_SUFFIX = a
|
||||
DYNAMIC_LIB_SUFFIX = dll
|
||||
else
|
||||
STATIC_LIB_SUFFIX = a
|
||||
DYNAMIC_LIB_SUFFIX = so
|
||||
endif
|
||||
endif
|
||||
STATIC_LIB_NAME = $(LIB_NAME).$(STATIC_LIB_SUFFIX)
|
||||
DYNAMIC_LIB_NAME = $(LIB_NAME).$(DYNAMIC_LIB_SUFFIX)
|
||||
STATIC_LIB = $(LIBPATH)/$(STATIC_LIB_NAME)
|
||||
@@ -60,17 +61,20 @@ else
|
||||
LINKD = $(CC) -shared
|
||||
endif
|
||||
|
||||
debug : CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) $(DEBUG_CFLAGS) -W -Wall -Wmissing-prototypes -Wstrict-prototypes -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
|
||||
valgrind: CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) $(DEBUG_CFLAGS) -DFLAC__VALGRIND_TESTING -W -Wall -Wmissing-prototypes -Wstrict-prototypes -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
|
||||
release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -finline-functions -DNDEBUG $(CONFIG_CFLAGS) $(RELEASE_CFLAGS) -W -Wall -Wmissing-prototypes -Wstrict-prototypes -Winline -DFLaC__INLINE=__inline__ -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
|
||||
debug : CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) $(DEBUG_CFLAGS) -W -Wall -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
|
||||
valgrind: CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) $(DEBUG_CFLAGS) -DFLAC__VALGRIND_TESTING -W -Wall -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
|
||||
release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -finline-functions -DNDEBUG $(CONFIG_CFLAGS) $(RELEASE_CFLAGS) -W -Wall -Winline -DFLaC__INLINE=__inline__ -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
|
||||
|
||||
LFLAGS = -L$(LIBPATH)
|
||||
CFLAGS = $(CFLAGS) -Wmissing-prototypes -Wstrict-prototypes
|
||||
CXXFLAGS = $(CFLAGS)
|
||||
|
||||
DEBUG_OBJS = $(SRCS_C:%.c=%.debug.o) $(SRCS_CC:%.cc=%.debug.o) $(SRCS_CPP:%.cpp=%.debug.o) $(SRCS_NASM:%.nasm=%.debug.o) $(SRCS_S:%.s=%.debug.o)
|
||||
RELEASE_OBJS = $(SRCS_C:%.c=%.release.o) $(SRCS_CC:%.cc=%.release.o) $(SRCS_CPP:%.cpp=%.release.o) $(SRCS_NASM:%.nasm=%.release.o) $(SRCS_S:%.s=%.release.o)
|
||||
LFLAGS = -L$(LIBPATH)
|
||||
|
||||
DEBUG_OBJS = $(SRCS_C:%.c=%.debug.o) $(SRCS_CC:%.cc=%.debug.o) $(SRCS_CPP:%.cpp=%.debug.o) $(SRCS_NASM:%.nasm=%.debug.o)
|
||||
RELEASE_OBJS = $(SRCS_C:%.c=%.release.o) $(SRCS_CC:%.cc=%.release.o) $(SRCS_CPP:%.cpp=%.release.o) $(SRCS_NASM:%.nasm=%.release.o)
|
||||
ifeq ($(PROC),x86_64)
|
||||
DEBUG_PIC_OBJS = $(SRCS_C:%.c=%.debug.pic.o) $(SRCS_CC:%.cc=%.debug.pic.o) $(SRCS_CPP:%.cpp=%.debug.pic.o) $(SRCS_NASM:%.nasm=%.debug.pic.o) $(SRCS_S:%.s=%.debug.pic.o)
|
||||
RELEASE_PIC_OBJS = $(SRCS_C:%.c=%.release.pic.o) $(SRCS_CC:%.cc=%.release.pic.o) $(SRCS_CPP:%.cpp=%.release.pic.o) $(SRCS_NASM:%.nasm=%.release.pic.o) $(SRCS_S:%.s=%.release.pic.o)
|
||||
DEBUG_PIC_OBJS = $(SRCS_C:%.c=%.debug.pic.o) $(SRCS_CC:%.cc=%.debug.pic.o) $(SRCS_CPP:%.cpp=%.debug.pic.o) $(SRCS_NASM:%.nasm=%.debug.pic.o)
|
||||
RELEASE_PIC_OBJS = $(SRCS_C:%.c=%.release.pic.o) $(SRCS_CC:%.cc=%.release.pic.o) $(SRCS_CPP:%.cpp=%.release.pic.o) $(SRCS_NASM:%.nasm=%.release.pic.o)
|
||||
endif
|
||||
|
||||
debug : $(DEBUG_STATIC_LIB) $(DEBUG_DYNAMIC_LIB)
|
||||
|
||||
Reference in New Issue
Block a user