mirror of
https://github.com/cookiengineer/audacity
synced 2025-10-10 16:43:33 +02:00
Update libflac to 1.3.0.
This commit is contained in:
lllucius
@@ -1,8 +1,9 @@
|
||||
# FLAC - Free Lossless Audio Codec
|
||||
# Copyright (C) 2002,2003,2004,2005,2006,2007 Josh Coalson
|
||||
# Copyright (C) 2002-2009 Josh Coalson
|
||||
# Copyright (C) 2011-2013 Xiph.Org Foundation
|
||||
#
|
||||
# This file is part the FLAC project. FLAC is comprised of several
|
||||
# components distributed under difference licenses. The codec libraries
|
||||
# components distributed under different licenses. The codec libraries
|
||||
# are distributed under Xiph.Org's BSD-like license (see the file
|
||||
# COPYING.Xiph in this distribution). All other programs, libraries, and
|
||||
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
|
||||
@@ -16,6 +17,7 @@
|
||||
# distribution.
|
||||
|
||||
EXTRA_DIST = \
|
||||
compile.mk \
|
||||
config.mk \
|
||||
exe.mk \
|
||||
lib.mk
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
# Makefile.in generated by automake 1.11.1 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.11.6 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
||||
# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
|
||||
# Inc.
|
||||
# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
|
||||
@@ -16,10 +16,11 @@
|
||||
@SET_MAKE@
|
||||
|
||||
# FLAC - Free Lossless Audio Codec
|
||||
# Copyright (C) 2002,2003,2004,2005,2006,2007 Josh Coalson
|
||||
# Copyright (C) 2002-2009 Josh Coalson
|
||||
# Copyright (C) 2011-2013 Xiph.Org Foundation
|
||||
#
|
||||
# This file is part the FLAC project. FLAC is comprised of several
|
||||
# components distributed under difference licenses. The codec libraries
|
||||
# components distributed under different licenses. The codec libraries
|
||||
# are distributed under Xiph.Org's BSD-like license (see the file
|
||||
# COPYING.Xiph in this distribution). All other programs, libraries, and
|
||||
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
|
||||
@@ -32,6 +33,23 @@
|
||||
# restrictive of those mentioned above. See the file COPYING.Xiph in this
|
||||
# distribution.
|
||||
VPATH = @srcdir@
|
||||
am__make_dryrun = \
|
||||
{ \
|
||||
am__dry=no; \
|
||||
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;; \
|
||||
esac; \
|
||||
test $$am__dry = yes; \
|
||||
}
|
||||
pkgdatadir = $(datadir)/@PACKAGE@
|
||||
pkgincludedir = $(includedir)/@PACKAGE@
|
||||
pkglibdir = $(libdir)/@PACKAGE@
|
||||
@@ -53,19 +71,38 @@ host_triplet = @host@
|
||||
subdir = build
|
||||
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/configure.in
|
||||
am__aclocal_m4_deps = $(top_srcdir)/m4/add_cflags.m4 \
|
||||
$(top_srcdir)/m4/bswap.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
|
||||
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
||||
$(ACLOCAL_M4)
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||
mkinstalldirs = $(install_sh) -d
|
||||
CONFIG_HEADER = $(top_builddir)/config.h
|
||||
CONFIG_CLEAN_FILES =
|
||||
CONFIG_CLEAN_VPATH_FILES =
|
||||
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_at = $(am__v_at_@AM_V@)
|
||||
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
|
||||
am__v_at_0 = @
|
||||
SOURCES =
|
||||
DIST_SOURCES =
|
||||
am__can_run_installinfo = \
|
||||
case $$AM_UPDATE_INFO_DIR in \
|
||||
n|no|NO) false;; \
|
||||
*) (install-info --version) >/dev/null 2>&1;; \
|
||||
esac
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
ACLOCAL = @ACLOCAL@
|
||||
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
|
||||
AMTAR = @AMTAR@
|
||||
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
||||
AR = @AR@
|
||||
AS = @AS@
|
||||
AUTOCONF = @AUTOCONF@
|
||||
@@ -87,6 +124,7 @@ CXXFLAGS = @CXXFLAGS@
|
||||
CYGPATH_W = @CYGPATH_W@
|
||||
DEFS = @DEFS@
|
||||
DEPDIR = @DEPDIR@
|
||||
DLLTOOL = @DLLTOOL@
|
||||
DOCBOOK_TO_MAN = @DOCBOOK_TO_MAN@
|
||||
DOXYGEN = @DOXYGEN@
|
||||
DSYMUTIL = @DSYMUTIL@
|
||||
@@ -100,6 +138,9 @@ 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@
|
||||
GREP = @GREP@
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
@@ -116,9 +157,9 @@ LIPO = @LIPO@
|
||||
LN_S = @LN_S@
|
||||
LTLIBICONV = @LTLIBICONV@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
MAINT = @MAINT@
|
||||
LT_NO_UNDEFINED = @LT_NO_UNDEFINED@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MINGW_WINSOCK_LIBS = @MINGW_WINSOCK_LIBS@
|
||||
MANIFEST_TOOL = @MANIFEST_TOOL@
|
||||
MKDIR_P = @MKDIR_P@
|
||||
NASM = @NASM@
|
||||
NM = @NM@
|
||||
@@ -128,6 +169,7 @@ OBJEXT = @OBJEXT@
|
||||
OBJ_FORMAT = @OBJ_FORMAT@
|
||||
OGG_CFLAGS = @OGG_CFLAGS@
|
||||
OGG_LIBS = @OGG_LIBS@
|
||||
OGG_PACKAGE = @OGG_PACKAGE@
|
||||
OTOOL = @OTOOL@
|
||||
OTOOL64 = @OTOOL64@
|
||||
PACKAGE = @PACKAGE@
|
||||
@@ -144,10 +186,22 @@ SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
STRIP = @STRIP@
|
||||
VERSION = @VERSION@
|
||||
XMMS_CFLAGS = @XMMS_CFLAGS@
|
||||
XMMS_CONFIG = @XMMS_CONFIG@
|
||||
XMMS_DATA_DIR = @XMMS_DATA_DIR@
|
||||
XMMS_EFFECT_PLUGIN_DIR = @XMMS_EFFECT_PLUGIN_DIR@
|
||||
XMMS_GENERAL_PLUGIN_DIR = @XMMS_GENERAL_PLUGIN_DIR@
|
||||
XMMS_INPUT_PLUGIN_DIR = @XMMS_INPUT_PLUGIN_DIR@
|
||||
XMMS_LIBS = @XMMS_LIBS@
|
||||
XMMS_OUTPUT_PLUGIN_DIR = @XMMS_OUTPUT_PLUGIN_DIR@
|
||||
XMMS_PLUGIN_DIR = @XMMS_PLUGIN_DIR@
|
||||
XMMS_VERSION = @XMMS_VERSION@
|
||||
XMMS_VISUALIZATION_PLUGIN_DIR = @XMMS_VISUALIZATION_PLUGIN_DIR@
|
||||
abs_builddir = @abs_builddir@
|
||||
abs_srcdir = @abs_srcdir@
|
||||
abs_top_builddir = @abs_top_builddir@
|
||||
abs_top_srcdir = @abs_top_srcdir@
|
||||
ac_ct_AR = @ac_ct_AR@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
ac_ct_CXX = @ac_ct_CXX@
|
||||
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
|
||||
@@ -181,7 +235,6 @@ libdir = @libdir@
|
||||
libexecdir = @libexecdir@
|
||||
localedir = @localedir@
|
||||
localstatedir = @localstatedir@
|
||||
lt_ECHO = @lt_ECHO@
|
||||
mandir = @mandir@
|
||||
mkdir_p = @mkdir_p@
|
||||
oldincludedir = @oldincludedir@
|
||||
@@ -198,6 +251,7 @@ top_build_prefix = @top_build_prefix@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
EXTRA_DIST = \
|
||||
compile.mk \
|
||||
config.mk \
|
||||
exe.mk \
|
||||
lib.mk
|
||||
@@ -205,7 +259,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*) \
|
||||
@@ -214,9 +268,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
|
||||
exit 1;; \
|
||||
esac; \
|
||||
done; \
|
||||
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu build/Makefile'; \
|
||||
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign build/Makefile'; \
|
||||
$(am__cd) $(top_srcdir) && \
|
||||
$(AUTOMAKE) --gnu build/Makefile
|
||||
$(AUTOMAKE) --foreign build/Makefile
|
||||
.PRECIOUS: Makefile
|
||||
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
||||
@case '$?' in \
|
||||
@@ -230,9 +284,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):
|
||||
|
||||
@@ -292,10 +346,15 @@ install-am: all-am
|
||||
|
||||
installcheck: installcheck-am
|
||||
install-strip:
|
||||
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
|
||||
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
|
||||
`test -z '$(STRIP)' || \
|
||||
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
|
||||
if test -z '$(STRIP)'; then \
|
||||
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
|
||||
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
|
||||
install; \
|
||||
else \
|
||||
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
|
||||
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
|
||||
"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
|
||||
fi
|
||||
mostlyclean-generic:
|
||||
|
||||
clean-generic:
|
||||
|
||||
64
lib-src/libflac/build/compile.mk
Normal file
64
lib-src/libflac/build/compile.mk
Normal file
@@ -0,0 +1,64 @@
|
||||
# FLAC - Free Lossless Audio Codec
|
||||
# Copyright (C) 2001-2009 Josh Coalson
|
||||
# Copyright (C) 2011-2013 Xiph.Org Foundation
|
||||
#
|
||||
# This file is part the FLAC project. FLAC is comprised of several
|
||||
# components distributed under different licenses. The codec libraries
|
||||
# are distributed under Xiph.Org's BSD-like license (see the file
|
||||
# COPYING.Xiph in this distribution). All other programs, libraries, and
|
||||
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
|
||||
# is distributed under the Gnu FDL (see COPYING.FDL). Each file in the
|
||||
# FLAC distribution contains at the top the terms under which it may be
|
||||
# distributed.
|
||||
#
|
||||
# Since this particular file is relevant to all components of FLAC,
|
||||
# it may be distributed under the Xiph.Org license, which is the least
|
||||
# restrictive of those mentioned above. See the file COPYING.Xiph in this
|
||||
# distribution.
|
||||
|
||||
#
|
||||
# GNU makefile fragment for building a library
|
||||
#
|
||||
|
||||
%.debug.o %.release.o : %.c
|
||||
$(CC) $(CFLAGS) -c $< -o $@
|
||||
%.debug.o %.release.o : %.cc
|
||||
$(CCC) $(CFLAGS) -c $< -o $@
|
||||
%.debug.o %.release.o : %.cpp
|
||||
$(CCC) $(CFLAGS) -c $< -o $@
|
||||
%.debug.pic.o %.release.pic.o : %.c
|
||||
$(CC) $(CFLAGS) -fPIC -DPIC -c $< -o $@
|
||||
%.debug.pic.o %.release.pic.o : %.cc
|
||||
$(CCC) $(CFLAGS) -fPIC -DPIC -c $< -o $@
|
||||
%.debug.pic.o %.release.pic.o : %.cpp
|
||||
$(CCC) $(CFLAGS) -fPIC -DPIC -c $< -o $@
|
||||
%.debug.i %.release.i : %.c
|
||||
$(CC) $(CFLAGS) -E $< -o $@
|
||||
%.debug.i %.release.i : %.cc
|
||||
$(CCC) $(CFLAGS) -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
|
||||
|
||||
%.debug.o : %.nasm
|
||||
$(NASM) -f elf -d OBJ_FORMAT_elf -i ia32/ -g $< -o $@
|
||||
%.release.o : %.nasm
|
||||
$(NASM) -f elf -d OBJ_FORMAT_elf -i ia32/ $< -o $@
|
||||
%.debug.pic.o : %.nasm
|
||||
$(NASM) -f elf -d OBJ_FORMAT_elf -i ia32/ -g $< -o $@
|
||||
%.release.pic.o : %.nasm
|
||||
$(NASM) -f elf -d OBJ_FORMAT_elf -i ia32/ $< -o $@
|
||||
@@ -1,8 +1,9 @@
|
||||
# FLAC - Free Lossless Audio Codec
|
||||
# Copyright (C) 2001,2002,2003,2004,2005,2006,2007 Josh Coalson
|
||||
# Copyright (C) 2001-2009 Josh Coalson
|
||||
# Copyright (C) 2011-2013 Xiph.Org Foundation
|
||||
#
|
||||
# This file is part the FLAC project. FLAC is comprised of several
|
||||
# components distributed under difference licenses. The codec libraries
|
||||
# components distributed under different licenses. The codec libraries
|
||||
# are distributed under Xiph.Org's BSD-like license (see the file
|
||||
# COPYING.Xiph in this distribution). All other programs, libraries, and
|
||||
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
|
||||
@@ -15,19 +16,58 @@
|
||||
# restrictive of those mentioned above. See the file COPYING.Xiph in this
|
||||
# distribution.
|
||||
|
||||
#
|
||||
# customizable settings from the make invocation
|
||||
#
|
||||
|
||||
USE_OGG ?= 1
|
||||
USE_ICONV ?= 1
|
||||
|
||||
#
|
||||
# debug/release selection
|
||||
#
|
||||
|
||||
DEFAULT_BUILD = release
|
||||
|
||||
# returns Linux, Darwin, FreeBSD, etc.
|
||||
ifdef OS_OVERRIDE
|
||||
OS := $(OS_OVERRIDE)
|
||||
else
|
||||
OS := $(shell uname -s)
|
||||
endif
|
||||
# returns i386, x86_64, powerpc, etc.
|
||||
ifdef PROC_OVERRIDE
|
||||
PROC := $(PROC_OVERRIDE)
|
||||
else
|
||||
ifeq ($(findstring MINGW,$(OS)),MINGW)
|
||||
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
|
||||
PROC := x86_64
|
||||
endif
|
||||
else
|
||||
PROC := $(shell uname -p)
|
||||
endif
|
||||
endif
|
||||
ifeq ($(PROC),powerpc)
|
||||
PROC := ppc
|
||||
endif
|
||||
|
||||
ifeq ($(OS),Linux)
|
||||
PROC := $(shell uname -m)
|
||||
USE_ICONV := 0
|
||||
endif
|
||||
|
||||
debug : BUILD = debug
|
||||
valgrind : BUILD = debug
|
||||
release : BUILD = release
|
||||
|
||||
# override LINKAGE on OS X until we figure out how to get 'cc -static' to work
|
||||
ifeq ($(DARWIN_BUILD),yes)
|
||||
LINKAGE =
|
||||
ifeq ($(OS),Darwin)
|
||||
LINKAGE = -arch $(PROC)
|
||||
else
|
||||
debug : LINKAGE = -static
|
||||
valgrind : LINKAGE = -dynamic
|
||||
@@ -40,12 +80,47 @@ all default: $(DEFAULT_BUILD)
|
||||
# GNU makefile fragment for emulating stuff normally done by configure
|
||||
#
|
||||
|
||||
VERSION=\"1.2.1\"
|
||||
VERSION=\"1.3.0\"
|
||||
|
||||
ifeq ($(DARWIN_BUILD),yes)
|
||||
CONFIG_CFLAGS=-DHAVE_INTTYPES_H -DHAVE_ICONV -DHAVE_LANGINFO_CODESET -DFLAC__HAS_OGG -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DFLAC__SYS_DARWIN -DWORDS_BIGENDIAN
|
||||
CONFIG_CFLAGS=-DHAVE_STDINT_H -DHAVE_INTTYPES_H -DHAVE_CXX_VARARRAYS -DHAVE_LANGINFO_CODESET -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
|
||||
|
||||
ifeq ($(OS),Darwin)
|
||||
CONFIG_CFLAGS += -DFLAC__SYS_DARWIN -arch $(PROC)
|
||||
else
|
||||
CONFIG_CFLAGS=-DHAVE_INTTYPES_H -DHAVE_ICONV -DHAVE_LANGINFO_CODESET -DHAVE_SOCKLEN_T -DFLAC__HAS_OGG -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
|
||||
CONFIG_CFLAGS += -DHAVE_SOCKLEN_T
|
||||
endif
|
||||
|
||||
ifeq ($(PROC),ppc)
|
||||
CONFIG_CFLAGS += -DWORDS_BIGENDIAN=1
|
||||
else
|
||||
CONFIG_CFLAGS += -DWORDS_BIGENDIAN=0
|
||||
endif
|
||||
|
||||
ifeq ($(OS),Linux)
|
||||
ifeq ($(PROC),x86_64)
|
||||
CONFIG_CFLAGS += -fPIC
|
||||
endif
|
||||
endif
|
||||
|
||||
ifneq (0,$(USE_ICONV))
|
||||
CONFIG_CFLAGS += -DHAVE_ICONV
|
||||
ICONV_LIBS = -liconv
|
||||
else
|
||||
ICONV_LIBS =
|
||||
endif
|
||||
|
||||
ifneq (0,$(USE_OGG))
|
||||
CONFIG_CFLAGS += -DFLAC__HAS_OGG=1
|
||||
OGG_INCLUDES = -I$(OGG_INCLUDE_DIR)
|
||||
OGG_EXPLICIT_LIBS = $(OGG_LIB_DIR)/libogg.a
|
||||
OGG_LIBS = -L$(OGG_LIB_DIR) -logg
|
||||
OGG_SRCS = $(OGG_SRCS_C)
|
||||
else
|
||||
CONFIG_CFLAGS += -DFLAC__HAS_OGG=0
|
||||
OGG_INCLUDES =
|
||||
OGG_EXPLICIT_LIBS =
|
||||
OGG_LIBS =
|
||||
OGG_SRCS =
|
||||
endif
|
||||
|
||||
OGG_INCLUDE_DIR=$(HOME)/local/include
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
# FLAC - Free Lossless Audio Codec
|
||||
# Copyright (C) 2001,2002,2003,2004,2005,2006,2007 Josh Coalson
|
||||
# Copyright (C) 2001-2009 Josh Coalson
|
||||
# Copyright (C) 2011-2013 Xiph.Org Foundation
|
||||
#
|
||||
# This file is part the FLAC project. FLAC is comprised of several
|
||||
# components distributed under difference licenses. The codec libraries
|
||||
# components distributed under different licenses. The codec libraries
|
||||
# are distributed under Xiph.Org's BSD-like license (see the file
|
||||
# COPYING.Xiph in this distribution). All other programs, libraries, and
|
||||
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
|
||||
@@ -21,16 +22,16 @@
|
||||
|
||||
include $(topdir)/build/config.mk
|
||||
|
||||
ifeq ($(DARWIN_BUILD),yes)
|
||||
CC = cc
|
||||
CCC = c++
|
||||
ifeq ($(OS),Darwin)
|
||||
CC = cc
|
||||
CCC = c++
|
||||
else
|
||||
CC = gcc
|
||||
CCC = g++
|
||||
CC = gcc
|
||||
CCC = g++
|
||||
endif
|
||||
NASM = nasm
|
||||
LINK = $(CC) $(LINKAGE)
|
||||
OBJPATH = $(topdir)/obj
|
||||
OBJPATH = $(topdir)/objs
|
||||
BINPATH = $(OBJPATH)/$(BUILD)/bin
|
||||
LIBPATH = $(OBJPATH)/$(BUILD)/lib
|
||||
DEBUG_BINPATH = $(OBJPATH)/debug/bin
|
||||
@@ -47,8 +48,12 @@ release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -finline-functions -D
|
||||
|
||||
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)
|
||||
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)
|
||||
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)
|
||||
endif
|
||||
|
||||
debug : $(DEBUG_PROGRAM)
|
||||
valgrind: $(DEBUG_PROGRAM)
|
||||
@@ -56,41 +61,25 @@ release : $(RELEASE_PROGRAM)
|
||||
|
||||
# by default on OS X we link with static libs as much as possible
|
||||
|
||||
$(DEBUG_PROGRAM) : $(DEBUG_OBJS)
|
||||
ifeq ($(DARWIN_BUILD),yes)
|
||||
$(DEBUG_PROGRAM) : $(DEBUG_OBJS) $(DEBUG_PIC_OBJS)
|
||||
ifeq ($(OS),Darwin)
|
||||
$(LINK) -o $@ $(DEBUG_OBJS) $(EXPLICIT_LIBS)
|
||||
else
|
||||
$(LINK) -o $@ $(DEBUG_OBJS) $(LFLAGS) $(LIBS)
|
||||
endif
|
||||
|
||||
$(RELEASE_PROGRAM) : $(RELEASE_OBJS)
|
||||
ifeq ($(DARWIN_BUILD),yes)
|
||||
$(RELEASE_PROGRAM) : $(RELEASE_OBJS) $(RELEASE_PIC_OBJS)
|
||||
ifeq ($(OS),Darwin)
|
||||
$(LINK) -o $@ $(RELEASE_OBJS) $(EXPLICIT_LIBS)
|
||||
else
|
||||
$(LINK) -o $@ $(RELEASE_OBJS) $(LFLAGS) $(LIBS)
|
||||
endif
|
||||
|
||||
%.debug.o %.release.o : %.c
|
||||
$(CC) $(CFLAGS) -c $< -o $@
|
||||
%.debug.o %.release.o : %.cc
|
||||
$(CCC) $(CFLAGS) -c $< -o $@
|
||||
%.debug.o %.release.o : %.cpp
|
||||
$(CCC) $(CFLAGS) -c $< -o $@
|
||||
%.debug.i %.release.i : %.c
|
||||
$(CC) $(CFLAGS) -E $< -o $@
|
||||
%.debug.i %.release.i : %.cc
|
||||
$(CCC) $(CFLAGS) -E $< -o $@
|
||||
%.debug.i %.release.i : %.cpp
|
||||
$(CCC) $(CFLAGS) -E $< -o $@
|
||||
|
||||
%.debug.o : %.nasm
|
||||
$(NASM) -f elf -d OBJ_FORMAT_elf -i ia32/ -g $< -o $@
|
||||
%.release.o : %.nasm
|
||||
$(NASM) -f elf -d OBJ_FORMAT_elf -i ia32/ $< -o $@
|
||||
include $(topdir)/build/compile.mk
|
||||
|
||||
.PHONY : clean
|
||||
clean :
|
||||
-rm -f $(DEBUG_OBJS) $(RELEASE_OBJS) $(OBJPATH)/*/bin/$(PROGRAM_NAME)
|
||||
-rm -f $(DEBUG_OBJS) $(RELEASE_OBJS) $(DEBUG_PIC_OBJS) $(RELEASE_PIC_OBJS) $(OBJPATH)/*/bin/$(PROGRAM_NAME)
|
||||
|
||||
.PHONY : depend
|
||||
depend:
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
# FLAC - Free Lossless Audio Codec
|
||||
# Copyright (C) 2001,2002,2003,2004,2005,2006,2007 Josh Coalson
|
||||
# Copyright (C) 2001-2009 Josh Coalson
|
||||
# Copyright (C) 2011-2013 Xiph.Org Foundation
|
||||
#
|
||||
# This file is part the FLAC project. FLAC is comprised of several
|
||||
# components distributed under difference licenses. The codec libraries
|
||||
# components distributed under different licenses. The codec libraries
|
||||
# are distributed under Xiph.Org's BSD-like license (see the file
|
||||
# COPYING.Xiph in this distribution). All other programs, libraries, and
|
||||
# plugins are distributed under the GPL (see COPYING.GPL). The documentation
|
||||
@@ -21,26 +22,29 @@
|
||||
|
||||
include $(topdir)/build/config.mk
|
||||
|
||||
ifeq ($(DARWIN_BUILD),yes)
|
||||
CC = cc
|
||||
CCC = c++
|
||||
ifeq ($(OS),Darwin)
|
||||
CC = cc
|
||||
CCC = c++
|
||||
else
|
||||
CC = gcc
|
||||
CCC = g++
|
||||
CC = gcc
|
||||
CCC = g++
|
||||
endif
|
||||
AS = as
|
||||
NASM = nasm
|
||||
LINK = ar cru
|
||||
OBJPATH = $(topdir)/obj
|
||||
OBJPATH = $(topdir)/objs
|
||||
LIBPATH = $(OBJPATH)/$(BUILD)/lib
|
||||
DEBUG_LIBPATH = $(OBJPATH)/debug/lib
|
||||
RELEASE_LIBPATH = $(OBJPATH)/release/lib
|
||||
ifeq ($(DARWIN_BUILD),yes)
|
||||
STATIC_LIB_SUFFIX = a
|
||||
DYNAMIC_LIB_SUFFIX = dylib
|
||||
ifeq ($(OS),Darwin)
|
||||
STATIC_LIB_SUFFIX = a
|
||||
DYNAMIC_LIB_SUFFIX = dylib
|
||||
else ifeq ($(findstring MINGW,$(OS)),MINGW)
|
||||
STATIC_LIB_SUFFIX = a
|
||||
DYNAMIC_LIB_SUFFIX = dll
|
||||
else
|
||||
STATIC_LIB_SUFFIX = a
|
||||
DYNAMIC_LIB_SUFFIX = so
|
||||
STATIC_LIB_SUFFIX = a
|
||||
DYNAMIC_LIB_SUFFIX = so
|
||||
endif
|
||||
STATIC_LIB_NAME = $(LIB_NAME).$(STATIC_LIB_SUFFIX)
|
||||
DYNAMIC_LIB_NAME = $(LIB_NAME).$(DYNAMIC_LIB_SUFFIX)
|
||||
@@ -50,10 +54,10 @@ DEBUG_STATIC_LIB = $(DEBUG_LIBPATH)/$(STATIC_LIB_NAME)
|
||||
DEBUG_DYNAMIC_LIB = $(DEBUG_LIBPATH)/$(DYNAMIC_LIB_NAME)
|
||||
RELEASE_STATIC_LIB = $(RELEASE_LIBPATH)/$(STATIC_LIB_NAME)
|
||||
RELEASE_DYNAMIC_LIB = $(RELEASE_LIBPATH)/$(DYNAMIC_LIB_NAME)
|
||||
ifeq ($(DARWIN_BUILD),yes)
|
||||
LINKD = $(CC) -dynamiclib -flat_namespace -undefined suppress -install_name $(DYNAMIC_LIB)
|
||||
ifeq ($(OS),Darwin)
|
||||
LINKD = $(CC) -dynamiclib -flat_namespace -undefined suppress -install_name $(DYNAMIC_LIB)
|
||||
else
|
||||
LINKD = $(CC) -shared
|
||||
LINKD = $(CC) -shared
|
||||
endif
|
||||
|
||||
debug : CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) $(DEBUG_CFLAGS) -W -Wall -Wmissing-prototypes -Wstrict-prototypes -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES)
|
||||
@@ -64,6 +68,10 @@ 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) $(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)
|
||||
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)
|
||||
endif
|
||||
|
||||
debug : $(DEBUG_STATIC_LIB) $(DEBUG_DYNAMIC_LIB)
|
||||
valgrind: $(DEBUG_STATIC_LIB) $(DEBUG_DYNAMIC_LIB)
|
||||
@@ -75,49 +83,33 @@ $(DEBUG_STATIC_LIB): $(DEBUG_OBJS)
|
||||
$(RELEASE_STATIC_LIB): $(RELEASE_OBJS)
|
||||
$(LINK) $@ $(RELEASE_OBJS) && ranlib $@
|
||||
|
||||
$(DEBUG_DYNAMIC_LIB) : $(DEBUG_OBJS)
|
||||
ifeq ($(DARWIN_BUILD),yes)
|
||||
$(DEBUG_DYNAMIC_LIB) : $(DEBUG_OBJS) $(DEBUG_PIC_OBJS)
|
||||
ifeq ($(OS),Darwin)
|
||||
echo Not building dynamic lib, command is: $(LINKD) -o $@ $(DEBUG_OBJS) $(LFLAGS) $(LIBS) -lc
|
||||
else
|
||||
ifeq ($(PROC),x86_64)
|
||||
$(LINKD) -o $@ $(DEBUG_PIC_OBJS) $(LFLAGS) $(LIBS)
|
||||
else
|
||||
$(LINKD) -o $@ $(DEBUG_OBJS) $(LFLAGS) $(LIBS)
|
||||
endif
|
||||
endif
|
||||
|
||||
$(RELEASE_DYNAMIC_LIB) : $(RELEASE_OBJS)
|
||||
ifeq ($(DARWIN_BUILD),yes)
|
||||
$(RELEASE_DYNAMIC_LIB) : $(RELEASE_OBJS) $(RELEASE_PIC_OBJS)
|
||||
ifeq ($(OS),Darwin)
|
||||
echo Not building dynamic lib, command is: $(LINKD) -o $@ $(RELEASE_OBJS) $(LFLAGS) $(LIBS) -lc
|
||||
else
|
||||
ifeq ($(PROC),x86_64)
|
||||
$(LINKD) -o $@ $(RELEASE_PIC_OBJS) $(LFLAGS) $(LIBS)
|
||||
else
|
||||
$(LINKD) -o $@ $(RELEASE_OBJS) $(LFLAGS) $(LIBS)
|
||||
endif
|
||||
|
||||
%.debug.o %.release.o : %.c
|
||||
$(CC) $(CFLAGS) -c $< -o $@
|
||||
%.debug.o %.release.o : %.cc
|
||||
$(CCC) $(CFLAGS) -c $< -o $@
|
||||
%.debug.o %.release.o : %.cpp
|
||||
$(CCC) $(CFLAGS) -c $< -o $@
|
||||
%.debug.i %.release.i : %.c
|
||||
$(CC) $(CFLAGS) -E $< -o $@
|
||||
%.debug.i %.release.i : %.cc
|
||||
$(CCC) $(CFLAGS) -E $< -o $@
|
||||
%.debug.i %.release.i : %.cpp
|
||||
$(CCC) $(CFLAGS) -E $< -o $@
|
||||
|
||||
%.debug.o %.release.o : %.s
|
||||
ifeq ($(DARWIN_BUILD),yes)
|
||||
#$(CC) -c -arch ppc -Wall -force_cpusubtype_ALL $< -o $@
|
||||
$(AS) -arch ppc -force_cpusubtype_ALL $< -o $@
|
||||
else
|
||||
$(AS) $< -o $@
|
||||
endif
|
||||
|
||||
%.debug.o : %.nasm
|
||||
$(NASM) -f elf -d OBJ_FORMAT_elf -i ia32/ -g $< -o $@
|
||||
%.release.o : %.nasm
|
||||
$(NASM) -f elf -d OBJ_FORMAT_elf -i ia32/ $< -o $@
|
||||
include $(topdir)/build/compile.mk
|
||||
|
||||
.PHONY : clean
|
||||
clean :
|
||||
-rm -f $(DEBUG_OBJS) $(RELEASE_OBJS) $(OBJPATH)/*/lib/$(STATIC_LIB_NAME) $(OBJPATH)/*/lib/$(DYNAMIC_LIB_NAME)
|
||||
-rm -f $(DEBUG_OBJS) $(RELEASE_OBJS) $(DEBUG_PIC_OBJS) $(RELEASE_PIC_OBJS) $(OBJPATH)/*/lib/$(STATIC_LIB_NAME) $(OBJPATH)/*/lib/$(DYNAMIC_LIB_NAME)
|
||||
|
||||
.PHONY : depend
|
||||
depend:
|
||||
|
||||
Reference in New Issue
Block a user