From 10123bb3ac5f9cb35eaaabc773f6183c3efa6008 Mon Sep 17 00:00:00 2001 From: Leland Lucius Date: Fri, 1 May 2015 04:34:33 -0500 Subject: [PATCH] Update Xcode 5+ project for flac 1.3.1 --- .../project.pbxproj | 36 ++++++++++++++++ mac/config/i386/lib-src/libflac/config.h | 43 +++++++++---------- 2 files changed, 56 insertions(+), 23 deletions(-) diff --git a/mac/Audacity_Xcode_5.1_with_10.6_sdk.xcodeproj/project.pbxproj b/mac/Audacity_Xcode_5.1_with_10.6_sdk.xcodeproj/project.pbxproj index d025f25a6..c7cafe7f3 100644 --- a/mac/Audacity_Xcode_5.1_with_10.6_sdk.xcodeproj/project.pbxproj +++ b/mac/Audacity_Xcode_5.1_with_10.6_sdk.xcodeproj/project.pbxproj @@ -849,6 +849,15 @@ 28884972131B6CF600B59735 /* zh_TW.po in Sources */ = {isa = PBXBuildFile; fileRef = 28884941131B6CF600B59735 /* zh_TW.po */; }; 28884973131B6CF600B59735 /* zh.po in Sources */ = {isa = PBXBuildFile; fileRef = 28884942131B6CF600B59735 /* zh.po */; }; 2888A1631AE25F9A00E06FDC /* Diags.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2888A1611AE25F9A00E06FDC /* Diags.cpp */; }; + 288A1FF91AF37EC000DC8F71 /* fixed_intrin_sse2.c in Sources */ = {isa = PBXBuildFile; fileRef = 288A1FF01AF37EC000DC8F71 /* fixed_intrin_sse2.c */; }; + 288A1FFA1AF37EC000DC8F71 /* fixed_intrin_ssse3.c in Sources */ = {isa = PBXBuildFile; fileRef = 288A1FF11AF37EC000DC8F71 /* fixed_intrin_ssse3.c */; }; + 288A1FFB1AF37EC000DC8F71 /* lpc_intrin_avx2.c in Sources */ = {isa = PBXBuildFile; fileRef = 288A1FF21AF37EC000DC8F71 /* lpc_intrin_avx2.c */; }; + 288A1FFC1AF37EC000DC8F71 /* lpc_intrin_sse.c in Sources */ = {isa = PBXBuildFile; fileRef = 288A1FF31AF37EC000DC8F71 /* lpc_intrin_sse.c */; }; + 288A1FFD1AF37EC000DC8F71 /* lpc_intrin_sse2.c in Sources */ = {isa = PBXBuildFile; fileRef = 288A1FF41AF37EC000DC8F71 /* lpc_intrin_sse2.c */; }; + 288A1FFE1AF37EC000DC8F71 /* lpc_intrin_sse41.c in Sources */ = {isa = PBXBuildFile; fileRef = 288A1FF51AF37EC000DC8F71 /* lpc_intrin_sse41.c */; }; + 288A1FFF1AF37EC000DC8F71 /* stream_encoder_intrin_avx2.c in Sources */ = {isa = PBXBuildFile; fileRef = 288A1FF61AF37EC000DC8F71 /* stream_encoder_intrin_avx2.c */; }; + 288A20001AF37EC000DC8F71 /* stream_encoder_intrin_sse2.c in Sources */ = {isa = PBXBuildFile; fileRef = 288A1FF71AF37EC000DC8F71 /* stream_encoder_intrin_sse2.c */; }; + 288A20011AF37EC000DC8F71 /* stream_encoder_intrin_ssse3.c in Sources */ = {isa = PBXBuildFile; fileRef = 288A1FF81AF37EC000DC8F71 /* stream_encoder_intrin_ssse3.c */; }; 288A544B1346D1BA0050D774 /* chanmap.c in Sources */ = {isa = PBXBuildFile; fileRef = 288A54481346D1BA0050D774 /* chanmap.c */; }; 288A544C1346D1BA0050D774 /* chanmap.h in Headers */ = {isa = PBXBuildFile; fileRef = 288A54491346D1BA0050D774 /* chanmap.h */; }; 288A544D1346D1BA0050D774 /* id3.c in Sources */ = {isa = PBXBuildFile; fileRef = 288A544A1346D1BA0050D774 /* id3.c */; }; @@ -2555,6 +2564,15 @@ 28884942131B6CF600B59735 /* zh.po */ = {isa = PBXFileReference; explicitFileType = sourcecode; fileEncoding = 5; name = zh.po; path = ../locale/zh.po; sourceTree = SOURCE_ROOT; }; 2888A1611AE25F9A00E06FDC /* Diags.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Diags.cpp; sourceTree = ""; }; 2888A1621AE25F9A00E06FDC /* Diags.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Diags.h; sourceTree = ""; }; + 288A1FF01AF37EC000DC8F71 /* fixed_intrin_sse2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fixed_intrin_sse2.c; sourceTree = ""; }; + 288A1FF11AF37EC000DC8F71 /* fixed_intrin_ssse3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fixed_intrin_ssse3.c; sourceTree = ""; }; + 288A1FF21AF37EC000DC8F71 /* lpc_intrin_avx2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lpc_intrin_avx2.c; sourceTree = ""; }; + 288A1FF31AF37EC000DC8F71 /* lpc_intrin_sse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lpc_intrin_sse.c; sourceTree = ""; }; + 288A1FF41AF37EC000DC8F71 /* lpc_intrin_sse2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lpc_intrin_sse2.c; sourceTree = ""; }; + 288A1FF51AF37EC000DC8F71 /* lpc_intrin_sse41.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lpc_intrin_sse41.c; sourceTree = ""; }; + 288A1FF61AF37EC000DC8F71 /* stream_encoder_intrin_avx2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = stream_encoder_intrin_avx2.c; sourceTree = ""; }; + 288A1FF71AF37EC000DC8F71 /* stream_encoder_intrin_sse2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = stream_encoder_intrin_sse2.c; sourceTree = ""; }; + 288A1FF81AF37EC000DC8F71 /* stream_encoder_intrin_ssse3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = stream_encoder_intrin_ssse3.c; sourceTree = ""; }; 288A54481346D1BA0050D774 /* chanmap.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = chanmap.c; sourceTree = ""; }; 288A54491346D1BA0050D774 /* chanmap.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = chanmap.h; sourceTree = ""; }; 288A544A1346D1BA0050D774 /* id3.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = id3.c; sourceTree = ""; }; @@ -3682,9 +3700,15 @@ 176EEABF09A2EF1100188F3B /* cpu.c */, 176EEAC209A2EF1100188F3B /* crc.c */, 176EEACB09A2EF1100188F3B /* fixed.c */, + 288A1FF01AF37EC000DC8F71 /* fixed_intrin_sse2.c */, + 288A1FF11AF37EC000DC8F71 /* fixed_intrin_ssse3.c */, 176EEACE09A2EF1100188F3B /* float.c */, 176EEAD109A2EF1100188F3B /* format.c */, 176EEB0009A2EF1100188F3B /* lpc.c */, + 288A1FF21AF37EC000DC8F71 /* lpc_intrin_avx2.c */, + 288A1FF31AF37EC000DC8F71 /* lpc_intrin_sse.c */, + 288A1FF41AF37EC000DC8F71 /* lpc_intrin_sse2.c */, + 288A1FF51AF37EC000DC8F71 /* lpc_intrin_sse41.c */, 176EEB0809A2EF1100188F3B /* md5.c */, 176EEB0B09A2EF1100188F3B /* memory.c */, 176EEB0E09A2EF1100188F3B /* metadata_iterators.c */, @@ -3696,6 +3720,9 @@ 176EEB2809A2EF1100188F3B /* stream_decoder.c */, 176EEB2B09A2EF1100188F3B /* stream_encoder.c */, 176EEB2E09A2EF1100188F3B /* stream_encoder_framing.c */, + 288A1FF61AF37EC000DC8F71 /* stream_encoder_intrin_avx2.c */, + 288A1FF71AF37EC000DC8F71 /* stream_encoder_intrin_sse2.c */, + 288A1FF81AF37EC000DC8F71 /* stream_encoder_intrin_ssse3.c */, ); path = libFLAC; sourceTree = ""; @@ -7208,13 +7235,21 @@ 176EEC0B09A2F20800188F3B /* float.c in Sources */, 176EEC0C09A2F20800188F3B /* format.c in Sources */, 176EEC0D09A2F20800188F3B /* lpc.c in Sources */, + 288A1FFC1AF37EC000DC8F71 /* lpc_intrin_sse.c in Sources */, + 288A20011AF37EC000DC8F71 /* stream_encoder_intrin_ssse3.c in Sources */, 176EEC0E09A2F20800188F3B /* md5.c in Sources */, 176EEC0F09A2F20800188F3B /* memory.c in Sources */, + 288A1FFA1AF37EC000DC8F71 /* fixed_intrin_ssse3.c in Sources */, 176EEC1009A2F20800188F3B /* metadata_iterators.c in Sources */, + 288A20001AF37EC000DC8F71 /* stream_encoder_intrin_sse2.c in Sources */, + 288A1FFE1AF37EC000DC8F71 /* lpc_intrin_sse41.c in Sources */, 176EEC1109A2F20800188F3B /* metadata_object.c in Sources */, + 288A1FFB1AF37EC000DC8F71 /* lpc_intrin_avx2.c in Sources */, 176EEC1409A2F20800188F3B /* stream_decoder.c in Sources */, 176EEC1509A2F20800188F3B /* stream_encoder.c in Sources */, + 288A1FFD1AF37EC000DC8F71 /* lpc_intrin_sse2.c in Sources */, 176EEC1609A2F20800188F3B /* stream_encoder_framing.c in Sources */, + 288A1FFF1AF37EC000DC8F71 /* stream_encoder_intrin_avx2.c in Sources */, 28EA56630D9753B000C8D1B6 /* bitreader.c in Sources */, 28EA56640D9753B000C8D1B6 /* bitwriter.c in Sources */, 28EA56650D9753B000C8D1B6 /* window.c in Sources */, @@ -7222,6 +7257,7 @@ ED924BD2182EA20500319F81 /* ogg_encoder_aspect.c in Sources */, ED924BD3182EA20500319F81 /* ogg_helper.c in Sources */, ED924BD4182EA20500319F81 /* ogg_mapping.c in Sources */, + 288A1FF91AF37EC000DC8F71 /* fixed_intrin_sse2.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/mac/config/i386/lib-src/libflac/config.h b/mac/config/i386/lib-src/libflac/config.h index 1f0c10213..15abcc2b0 100644 --- a/mac/config/i386/lib-src/libflac/config.h +++ b/mac/config/i386/lib-src/libflac/config.h @@ -11,7 +11,7 @@ #define CPU_IS_LITTLE_ENDIAN 1 /* define to align allocated memory on 32-byte boundaries */ -/* #undef FLAC__ALIGN_MALLOC_DATA */ +#define FLAC__ALIGN_MALLOC_DATA 1 /* define if building for ia32/i386 */ /* #undef FLAC__CPU_IA32 */ @@ -25,26 +25,26 @@ /* define if building for SPARC */ /* #undef FLAC__CPU_SPARC */ -/* define if you are compiling for PowerPC and have the 'as' assembler */ -/* #undef FLAC__HAS_AS */ +/* define if building for x86_64 */ +#define FLAC__CPU_X86_64 1 /* define if you have docbook-to-man or docbook2man */ /* #undef FLAC__HAS_DOCBOOK_TO_MAN */ -/* define if you are compiling for PowerPC and have the 'gas' assembler */ -#define FLAC__HAS_GAS 1 - /* define if you are compiling for x86 and have the NASM assembler */ #define FLAC__HAS_NASM 1 /* define if you have the ogg library */ -#define FLAC__HAS_OGG 1 +#define FLAC__HAS_OGG 0 + +/* Set to 1 if is available. */ +#define FLAC__HAS_X86INTRIN /* define to disable use of assembly code */ /* #undef FLAC__NO_ASM */ /* define if your operating system supports SSE instructions */ -/* #undef FLAC__SSE_OS */ +#define FLAC__SSE_OS 1 /* define if building for Darwin / MacOS X */ #define FLAC__SYS_DARWIN 1 @@ -52,21 +52,24 @@ /* define if building for Linux */ /* #undef FLAC__SYS_LINUX */ -/* define to enable use of 3Dnow! instructions */ -#define FLAC__USE_3DNOW 1 - /* define to enable use of Altivec instructions */ #define FLAC__USE_ALTIVEC 1 /* Define to 1 if `TIOCGWINSZ' requires . */ /* #undef GWINSZ_IN_SYS_IOCTL */ +/* Compiler has the __builtin_bswap16 intrinsic */ +#define HAVE_BSWAP16 1 + /* Compiler has the __builtin_bswap32 intrinsic */ #define HAVE_BSWAP32 1 /* Define to 1 if you have the header file. */ /* #undef HAVE_BYTESWAP_H */ +/* Define to 1 if you have the header file. */ +#define HAVE_CPUID_H 1 + /* Define to 1 if C++ supports variable-length arrays. */ #define HAVE_CXX_VARARRAYS 1 @@ -130,6 +133,9 @@ /* Define to 1 if you have the header file. */ #define HAVE_UNISTD_H 1 +/* Define to 1 if you have the header file. */ +#define HAVE_X86INTRIN_H 1 + /* Define as const if the declaration of iconv() needs const. */ #define ICONV_CONST @@ -137,9 +143,6 @@ */ #define LT_OBJDIR ".libs/" -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -/* #undef NO_MINUS_C_MINUS_O */ - /* Name of package */ #define PACKAGE "flac" @@ -150,7 +153,7 @@ #define PACKAGE_NAME "flac" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "flac 1.3.0" +#define PACKAGE_STRING "flac 1.3.1" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "flac" @@ -159,7 +162,7 @@ #define PACKAGE_URL "https://www.xiph.org/flac/" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.3.0" +#define PACKAGE_VERSION "1.3.1" /* The size of `off_t', as computed by sizeof. */ #define SIZEOF_OFF_T 8 @@ -193,7 +196,7 @@ /* Version number of package */ -#define VERSION "1.3.0" +#define VERSION "1.3.1" /* Target processor is big endian. */ #define WORDS_BIGENDIAN 0 @@ -230,9 +233,3 @@ /* Define to __typeof__ if your compiler spells it that way. */ /* #undef typeof */ -#ifdef WORDS_BIGENDIAN -#undef WORDS_BIGENDIAN -#endif -#if defined(__BIG_ENDIAN__) -#define WORDS_BIGENDIAN 1 -#endif