mirror of
https://github.com/cookiengineer/audacity
synced 2026-01-13 08:05:52 +01:00
Upgraded flac to 1.3.1
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user