aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLucas Eckels <eckels@google.com>2013-06-05 14:06:34 -0700
committerLucas Eckels <eckels@google.com>2013-06-05 14:06:34 -0700
commitf74447c42f67af8c7552f6aaf1562de25d566a7d (patch)
treefdaa913284dc045a2c5e6584a1ced2d9789af3e0
parent532a735ceeb097f378abbf6193878e3746580754 (diff)
downloadflac-jumper-stable.tar.gz
Fix Mac build. Copy config.h from golden value.jumper-stable
Change-Id: Idd12d25a8b91d1172293c12d4b92949a16cacc2c
-rw-r--r--.gitignore2
-rwxr-xr-xconfig_mac.h261
-rw-r--r--src/libFLAC/libFLAC.xcodeproj/project.pbxproj34
3 files changed, 297 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index ff6170fe..fede59a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,5 @@
Debug/
Release/
release/
+
+config.h \ No newline at end of file
diff --git a/config_mac.h b/config_mac.h
new file mode 100755
index 00000000..876859ad
--- /dev/null
+++ b/config_mac.h
@@ -0,0 +1,261 @@
+// Generated for specific platforms
+
+// Copied from config_mac.h.
+#ifndef __APPLE__
+ERROR Invalid platform generate using configure
+#endif
+
+/* Name of package */
+#define PACKAGE "flac"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT ""
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME ""
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING ""
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION ""
+
+/* Version number of package */
+#define VERSION "1.2.1"
+
+//
+// Mac PPC
+//
+#ifdef __POWERPC__
+
+/* define to align allocated memory on 32-byte boundaries */
+/* #undef FLAC__ALIGN_MALLOC_DATA */
+
+/* define if building for ia32/i386 */
+/* #undef FLAC__CPU_IA32 */
+
+/* define if building for PowerPC */
+#define FLAC__CPU_PPC 1
+
+/* 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 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 to disable use of assembly code */
+/* #undef FLAC__NO_ASM */
+
+/* define if your operating system supports SSE instructions */
+/* #undef FLAC__SSE_OS */
+
+/* define if building for Darwin / MacOS X */
+#define FLAC__SYS_DARWIN 1
+
+/* 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 you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
+#define HAVE_FSEEKO 1
+
+/* Define to 1 if you have the `getopt_long' function. */
+#define HAVE_GETOPT_LONG 1
+
+/* Define if you have the iconv() function. */
+#define HAVE_ICONV 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
+#define HAVE_LANGINFO_CODESET 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if the system has the type `socklen_t'. */
+/* #undef HAVE_SOCKLEN_T */
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define as const if the declaration of iconv() needs const. */
+#define ICONV_CONST
+
+/* The size of a `void*', as computed by sizeof. */
+#define SIZEOF_VOIDP 4
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define to 1 if your processor stores words with the most significant byte
+ first (like Motorola and SPARC, unlike Intel and VAX). */
+#define WORDS_BIGENDIAN 1
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+/* #undef _FILE_OFFSET_BITS */
+
+/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
+/* #undef _LARGEFILE_SOURCE */
+
+/* Define for large files, on AIX-style hosts. */
+/* #undef _LARGE_FILES */
+
+
+#else // Mac Intel Platform:
+
+/* define to align allocated memory on 32-byte boundaries */
+#define FLAC__ALIGN_MALLOC_DATA 1
+
+/* define if building for ia32/i386 */
+#define FLAC__CPU_IA32 1
+
+/* define if building for PowerPC */
+/* #undef FLAC__CPU_PPC */
+
+/* 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 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 to disable use of assembly code */
+/* #undef FLAC__NO_ASM */
+
+/* define if your operating system supports SSE instructions */
+/* #undef FLAC__SSE_OS */
+
+/* define if building for Darwin / MacOS X */
+#define FLAC__SYS_DARWIN 1
+
+/* 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 you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
+#define HAVE_FSEEKO 1
+
+/* Define to 1 if you have the `getopt_long' function. */
+#define HAVE_GETOPT_LONG 1
+
+/* Define if you have the iconv() function. */
+#define HAVE_ICONV 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
+#define HAVE_LANGINFO_CODESET 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if the system has the type `socklen_t'. */
+/* #undef HAVE_SOCKLEN_T */
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define as const if the declaration of iconv() needs const. */
+#define ICONV_CONST
+
+/* The size of a `void*', as computed by sizeof. */
+#define SIZEOF_VOIDP 4
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define to 1 if your processor stores words with the most significant byte
+ first (like Motorola and SPARC, unlike Intel and VAX). */
+/* #undef WORDS_BIGENDIAN */
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+/* #undef _FILE_OFFSET_BITS */
+
+/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
+/* #undef _LARGEFILE_SOURCE */
+
+/* Define for large files, on AIX-style hosts. */
+/* #undef _LARGE_FILES */
+
+#endif \ No newline at end of file
diff --git a/src/libFLAC/libFLAC.xcodeproj/project.pbxproj b/src/libFLAC/libFLAC.xcodeproj/project.pbxproj
index c8462a07..87830466 100644
--- a/src/libFLAC/libFLAC.xcodeproj/project.pbxproj
+++ b/src/libFLAC/libFLAC.xcodeproj/project.pbxproj
@@ -369,6 +369,7 @@
isa = PBXNativeTarget;
buildConfigurationList = D799E1280F45F21900EE750D /* Build configuration list for PBXNativeTarget "Build PPC" */;
buildPhases = (
+ FA3B3042175FCE6200800CF6 /* Copy config.h */,
D799E11D0F45F21400EE750D /* Headers */,
D799E11E0F45F21400EE750D /* Sources */,
D799E11F0F45F21400EE750D /* Frameworks */,
@@ -386,6 +387,7 @@
isa = PBXNativeTarget;
buildConfigurationList = D799E4DD0F45F29D00EE750D /* Build configuration list for PBXNativeTarget "Build i386" */;
buildPhases = (
+ FA3B306A175FCFF500800CF6 /* Copy config.h */,
D799E1290F45F22B00EE750D /* Headers */,
D799E12A0F45F22B00EE750D /* Sources */,
D799E12B0F45F22B00EE750D /* Frameworks */,
@@ -442,6 +444,38 @@
shellPath = /bin/sh;
shellScript = "lipo -create $CONFIGURATION_BUILD_DIR/libFLACPPC.a $CONFIGURATION_BUILD_DIR/libFLACi386.a -output $CONFIGURATION_BUILD_DIR/libFLAC.a";
};
+ FA3B3042175FCE6200800CF6 /* Copy config.h */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ "$(SRCROOT)/../../config_mac.h",
+ );
+ name = "Copy config.h";
+ outputPaths = (
+ "$(SRCROOT)/../../config.h",
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "cd $PROJECT_DIR/../../\ncp config_mac.h config.h\n";
+ };
+ FA3B306A175FCFF500800CF6 /* Copy config.h */ = {
+ isa = PBXShellScriptBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ );
+ inputPaths = (
+ "$(SRCROOT)/../../config_mac.h",
+ );
+ name = "Copy config.h";
+ outputPaths = (
+ "$(SRCROOT)/../../config.h",
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "cd $PROJECT_DIR/../../\ncp config_mac.h config.h\n";
+ };
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */