[xiph-commits] r14864 - in trunk/xiph-qt: . build-macosx/XiphQT.xcodeproj build-macosx/flac-support/FLAC.xcodeproj
arek at svn.xiph.org
arek at svn.xiph.org
Sun May 11 09:25:51 PDT 2008
Author: arek
Date: 2008-05-11 09:25:51 -0700 (Sun, 11 May 2008)
New Revision: 14864
Modified:
trunk/xiph-qt/ChangeLog
trunk/xiph-qt/build-macosx/XiphQT.xcodeproj/project.pbxproj
trunk/xiph-qt/build-macosx/flac-support/FLAC.xcodeproj/project.pbxproj
Log:
* build-macosx/XiphQT.xcodeproj/project.pbxproj:
* build-macosx/flac-support/FLAC.xcodeproj/project.pbxproj:
Update Xcode project files - make it build again.
Modified: trunk/xiph-qt/ChangeLog
===================================================================
--- trunk/xiph-qt/ChangeLog 2008-05-11 16:17:35 UTC (rev 14863)
+++ trunk/xiph-qt/ChangeLog 2008-05-11 16:25:51 UTC (rev 14864)
@@ -1,3 +1,9 @@
+2008-05-11 Arek Korbik <arkadini at gmail.com>
+
+ * build-macosx/XiphQT.xcodeproj/project.pbxproj:
+ * build-macosx/flac-support/FLAC.xcodeproj/project.pbxproj:
+ Update Xcode project files - make it build again.
+
=== release 0.1.8 ===
2007-09-02 Arek Korbik <arkadini at gmail.com>
Modified: trunk/xiph-qt/build-macosx/XiphQT.xcodeproj/project.pbxproj
===================================================================
--- trunk/xiph-qt/build-macosx/XiphQT.xcodeproj/project.pbxproj 2008-05-11 16:17:35 UTC (rev 14863)
+++ trunk/xiph-qt/build-macosx/XiphQT.xcodeproj/project.pbxproj 2008-05-11 16:25:51 UTC (rev 14864)
@@ -8,6 +8,7 @@
/* Begin PBXBuildFile section */
09C8F66C0C82FC7D00F72188 /* libtheoradec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 09C8F6460C82FBE500F72188 /* libtheoradec.a */; };
+ 37CA8E6D0DD74A65005C8CB6 /* libtheoradec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 09C8F6460C82FBE500F72188 /* libtheoradec.a */; };
7326B5130B5AC44B004CE9D3 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C167DFE841241C02AAC07 /* InfoPlist.strings */; };
7326B5160B5AC44B004CE9D3 /* common.c in Sources */ = {isa = PBXBuildFile; fileRef = 7374489F0B19EC05002B059E /* common.c */; };
7326B5170B5AC44B004CE9D3 /* OggImport.c in Sources */ = {isa = PBXBuildFile; fileRef = 737448A20B19EC05002B059E /* OggImport.c */; };
@@ -99,7 +100,7 @@
73744A890B1A0AFF002B059E /* TheoraDecoder.r in Rez */ = {isa = PBXBuildFile; fileRef = 73744A870B1A0AFF002B059E /* TheoraDecoder.r */; };
73744A8A0B1A0AFF002B059E /* TheoraEncoder.r in Rez */ = {isa = PBXBuildFile; fileRef = 73744A880B1A0AFF002B059E /* TheoraEncoder.r */; };
73744A910B1A0BB0002B059E /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73744A900B1A0BB0002B059E /* QuartzCore.framework */; };
- 73744ABC0B1A0CC4002B059E /* libtheora.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 730B1C960B19C33B00E06B34 /* libtheora.a */; };
+ 73744ABC0B1A0CC4002B059E /* libtheoraenc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 730B1C960B19C33B00E06B34 /* libtheoraenc.a */; };
73744C660B1A2AD8002B059E /* CAFLACDecoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73744C600B1A2AD8002B059E /* CAFLACDecoder.cpp */; };
73744C680B1A2AD8002B059E /* CAOggFLACDecoder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73744C620B1A2AD8002B059E /* CAOggFLACDecoder.cpp */; };
73744C6A0B1A2AD8002B059E /* flac_entrypoints.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 73744C640B1A2AD8002B059E /* flac_entrypoints.cpp */; };
@@ -144,6 +145,13 @@
remoteGlobalIDString = 09C8F6420C82FBE500F72188;
remoteInfo = "libtheoradec (static)";
};
+ 37CA8E6B0DD74A10005C8CB6 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 738837DE0B1938DC005C7A69 /* Theora.xcodeproj */;
+ proxyType = 1;
+ remoteGlobalIDString = 09C8F6420C82FBE500F72188 /* libtheoradec (static) */;
+ remoteInfo = "libtheoradec (static)";
+ };
730B1C930B19C33B00E06B34 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 738837DE0B1938DC005C7A69 /* Theora.xcodeproj */;
@@ -542,7 +550,8 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- 73744ABC0B1A0CC4002B059E /* libtheora.a in Frameworks */,
+ 37CA8E6D0DD74A65005C8CB6 /* libtheoradec.a in Frameworks */,
+ 73744ABC0B1A0CC4002B059E /* libtheoraenc.a in Frameworks */,
73744C920B1A3661002B059E /* libflac++.a in Frameworks */,
73744C970B1A36D8002B059E /* libflac.a in Frameworks */,
737449490B19F67A002B059E /* libspeex.a in Frameworks */,
@@ -629,7 +638,7 @@
isa = PBXGroup;
children = (
730B1C940B19C33B00E06B34 /* Theora.framework */,
- 730B1C960B19C33B00E06B34 /* libtheora.a */,
+ 730B1C960B19C33B00E06B34 /* libtheoraenc.a */,
09C8F6460C82FBE500F72188 /* libtheoradec.a */,
);
name = Products;
@@ -1077,6 +1086,7 @@
737449450B19F653002B059E /* PBXTargetDependency */,
73744C750B1A2D44002B059E /* PBXTargetDependency */,
73744C770B1A2D44002B059E /* PBXTargetDependency */,
+ 37CA8E6C0DD74A10005C8CB6 /* PBXTargetDependency */,
73744A990B1A0BEA002B059E /* PBXTargetDependency */,
);
name = XiphQT;
@@ -1091,6 +1101,7 @@
089C1669FE841209C02AAC07 /* Project object */ = {
isa = PBXProject;
buildConfigurationList = 4FADC23708B4156C00ABE55E /* Build configuration list for PBXProject "XiphQT" */;
+ compatibilityVersion = "Xcode 2.4";
hasScannedForEncodings = 1;
mainGroup = 089C166AFE841209C02AAC07 /* XiphQT */;
projectDirPath = "";
@@ -1116,6 +1127,7 @@
ProjectRef = 738837B00B19386C005C7A69 /* Vorbis.xcodeproj */;
},
);
+ projectRoot = ..;
targets = (
8D01CCC60486CAD60068D4B7 /* XiphQT */,
7326B5010B5AC44B004CE9D3 /* XiphQT (decoders) */,
@@ -1139,10 +1151,10 @@
remoteRef = 730B1C930B19C33B00E06B34 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 730B1C960B19C33B00E06B34 /* libtheora.a */ = {
+ 730B1C960B19C33B00E06B34 /* libtheoraenc.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
- path = libtheora.a;
+ path = libtheoraenc.a;
remoteRef = 730B1C950B19C33B00E06B34 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
@@ -1414,6 +1426,11 @@
name = "libtheoradec (static)";
targetProxy = 09C8F66A0C82FC7200F72188 /* PBXContainerItemProxy */;
};
+ 37CA8E6C0DD74A10005C8CB6 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ name = "libtheoradec (static)";
+ targetProxy = 37CA8E6B0DD74A10005C8CB6 /* PBXContainerItemProxy */;
+ };
7326B5020B5AC44B004CE9D3 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "libogg (static)";
@@ -1532,6 +1549,7 @@
INSTALL_PATH = "$(HOME)/Library/QuickTime";
OTHER_REZFLAGS = "$(inherited) -D TARGET_REZ_MAC_PPC=1 -D BUILD_UNIVERSAL";
PRODUCT_NAME = XiphQT;
+ WARNING_CFLAGS = "-Wall";
WRAPPER_EXTENSION = component;
ZERO_LINK = YES;
};
@@ -1540,10 +1558,6 @@
4FADC23508B4156C00ABE55E /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = (
- ppc,
- i386,
- );
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = XiphQT_Prefix.pch;
@@ -1569,6 +1583,7 @@
OTHER_LDFLAGS_i386 = "-Wl,-read_only_relocs,suppress";
OTHER_REZFLAGS = "$(inherited) -D TARGET_REZ_MAC_PPC=1 -D BUILD_UNIVERSAL";
PRODUCT_NAME = XiphQT;
+ WARNING_CFLAGS = "-Wall";
WRAPPER_EXTENSION = component;
};
name = Release;
@@ -1592,6 +1607,8 @@
4FADC23908B4156C00ABE55E /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
+ ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
GCC_OPTIMIZATION_LEVEL = 3;
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
@@ -1687,6 +1704,10 @@
isa = XCBuildConfiguration;
buildSettings = {
COPY_PHASE_STRIP = NO;
+ FRAMEWORK_SEARCH_PATHS = (
+ "$(value)",
+ "$(DEVELOPER_FRAMEWORKS_DIR_QUOTED)",
+ );
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -1726,6 +1747,10 @@
isa = XCBuildConfiguration;
buildSettings = {
COPY_PHASE_STRIP = YES;
+ FRAMEWORK_SEARCH_PATHS = (
+ "$(value)",
+ "$(DEVELOPER_FRAMEWORKS_DIR_QUOTED)",
+ );
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = G4;
Modified: trunk/xiph-qt/build-macosx/flac-support/FLAC.xcodeproj/project.pbxproj
===================================================================
--- trunk/xiph-qt/build-macosx/flac-support/FLAC.xcodeproj/project.pbxproj 2008-05-11 16:17:35 UTC (rev 14863)
+++ trunk/xiph-qt/build-macosx/flac-support/FLAC.xcodeproj/project.pbxproj 2008-05-11 16:25:51 UTC (rev 14864)
@@ -7,6 +7,9 @@
objects = {
/* Begin PBXBuildFile section */
+ 37CA8E130DD73E6F005C8CB6 /* window.h in Headers */ = {isa = PBXBuildFile; fileRef = 37CA8E120DD73E6F005C8CB6 /* window.h */; };
+ 37CA8E160DD73F2D005C8CB6 /* alloc.h in Headers */ = {isa = PBXBuildFile; fileRef = 37CA8E150DD73F2D005C8CB6 /* alloc.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ 37CA8E170DD73F2D005C8CB6 /* alloc.h in Headers */ = {isa = PBXBuildFile; fileRef = 37CA8E150DD73F2D005C8CB6 /* alloc.h */; };
73744B060B1A1925002B059E /* window.c in Sources */ = {isa = PBXBuildFile; fileRef = 73744B050B1A1925002B059E /* window.c */; };
73744B200B1A1D3A002B059E /* bitmath.c in Sources */ = {isa = PBXBuildFile; fileRef = 73E1963E0A0D1AB900D40234 /* bitmath.c */; };
73744B210B1A1D3B002B059E /* cpu.c in Sources */ = {isa = PBXBuildFile; fileRef = 73E1963F0A0D1AB900D40234 /* cpu.c */; };
@@ -97,6 +100,8 @@
/* Begin PBXFileReference section */
089C1667FE841158C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
32BAE0B70371A74B00C91783 /* FLAC_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FLAC_Prefix.pch; sourceTree = "<group>"; };
+ 37CA8E120DD73E6F005C8CB6 /* window.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = window.h; path = "../../external-libs/flac/src/libFLAC/include/private/window.h"; sourceTree = SOURCE_ROOT; };
+ 37CA8E150DD73F2D005C8CB6 /* alloc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = alloc.h; path = "../../external-libs/flac/include/share/alloc.h"; sourceTree = SOURCE_ROOT; };
73744B050B1A1925002B059E /* window.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = window.c; path = "../../external-libs/flac/src/libFLAC/window.c"; sourceTree = SOURCE_ROOT; };
73744B1B0B1A1C43002B059E /* libflac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libflac.a; sourceTree = BUILT_PRODUCTS_DIR; };
73744B520B1A21DA002B059E /* libflac++.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libflac++.a"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -240,6 +245,14 @@
name = Source;
sourceTree = "<group>";
};
+ 37CA8E140DD73EE9005C8CB6 /* share */ = {
+ isa = PBXGroup;
+ children = (
+ 37CA8E150DD73F2D005C8CB6 /* alloc.h */,
+ );
+ name = share;
+ sourceTree = "<group>";
+ };
73E195CE0A0D174A00D40234 /* src */ = {
isa = PBXGroup;
children = (
@@ -252,10 +265,9 @@
73E195CF0A0D175400D40234 /* FLAC */ = {
isa = PBXGroup;
children = (
+ 73E1963E0A0D1AB900D40234 /* bitmath.c */,
738C0AF70B8D4CFB0010DDDC /* bitreader.c */,
738C0AF80B8D4CFB0010DDDC /* bitwriter.c */,
- 73744B050B1A1925002B059E /* window.c */,
- 73E1963E0A0D1AB900D40234 /* bitmath.c */,
73E1963F0A0D1AB900D40234 /* cpu.c */,
73E196400A0D1AB900D40234 /* crc.c */,
73E196430A0D1AB900D40234 /* fixed.c */,
@@ -267,8 +279,9 @@
73E196490A0D1AB900D40234 /* metadata_iterators.c */,
73E1964A0A0D1AB900D40234 /* metadata_object.c */,
73E1964D0A0D1AB900D40234 /* stream_decoder.c */,
+ 73E1964F0A0D1AB900D40234 /* stream_encoder.c */,
73E1964E0A0D1AB900D40234 /* stream_encoder_framing.c */,
- 73E1964F0A0D1AB900D40234 /* stream_encoder.c */,
+ 73744B050B1A1925002B059E /* window.c */,
);
name = FLAC;
sourceTree = "<group>";
@@ -286,6 +299,7 @@
73E195D10A0D176C00D40234 /* include */ = {
isa = PBXGroup;
children = (
+ 37CA8E140DD73EE9005C8CB6 /* share */,
73E195D30A0D177F00D40234 /* FLAC++ */,
73E195D20A0D177600D40234 /* FLAC */,
);
@@ -325,10 +339,10 @@
73E195EE0A0D18B600D40234 /* private */ = {
isa = PBXGroup;
children = (
+ 73E196020A0D193600D40234 /* all.h */,
+ 73E196040A0D193700D40234 /* bitmath.h */,
738C0AF30B8D4BF40010DDDC /* bitreader.h */,
738C0AF40B8D4BF40010DDDC /* bitwriter.h */,
- 73E196020A0D193600D40234 /* all.h */,
- 73E196040A0D193700D40234 /* bitmath.h */,
73E196050A0D193700D40234 /* cpu.h */,
73E196060A0D193700D40234 /* crc.h */,
73E196070A0D193700D40234 /* fixed.h */,
@@ -339,6 +353,7 @@
73E1960C0A0D193700D40234 /* memory.h */,
73E1960D0A0D193700D40234 /* metadata.h */,
73E1960E0A0D193700D40234 /* stream_encoder_framing.h */,
+ 37CA8E120DD73E6F005C8CB6 /* window.h */,
);
name = private;
sourceTree = "<group>";
@@ -380,6 +395,7 @@
73E196A10A0D273D00D40234 /* export.h in Headers */,
73E196A20A0D273D00D40234 /* metadata.h in Headers */,
73E196ED0A0D29AE00D40234 /* FLAC++_Prefix.pch in Headers */,
+ 37CA8E170DD73F2D005C8CB6 /* alloc.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -414,6 +430,8 @@
73E1963C0A0D1A1E00D40234 /* stream_encoder_framing.h in Headers */,
738C0AF50B8D4BF40010DDDC /* bitreader.h in Headers */,
738C0AF60B8D4BF40010DDDC /* bitwriter.h in Headers */,
+ 37CA8E130DD73E6F005C8CB6 /* window.h in Headers */,
+ 37CA8E160DD73F2D005C8CB6 /* alloc.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -499,6 +517,7 @@
0867D690FE84028FC02AAC07 /* Project object */ = {
isa = PBXProject;
buildConfigurationList = 4FADC24608B4156D00ABE55E /* Build configuration list for PBXProject "FLAC" */;
+ compatibilityVersion = "Xcode 2.4";
hasScannedForEncodings = 1;
mainGroup = 0867D691FE84028FC02AAC07 /* FLAC */;
productRefGroup = 034768DDFF38A45A11DB9C8B /* Products */;
@@ -753,6 +772,7 @@
HEADER_SEARCH_PATHS = (
"$(inherited)",
"../../external-libs/flac/src/libFLAC/include",
+ "../../external-libs/flac/include",
);
INSTALL_PATH = /usr/local/lib;
PREBINDING = NO;
@@ -779,6 +799,7 @@
HEADER_SEARCH_PATHS = (
"$(inherited)",
"../../external-libs/flac/src/libFLAC/include",
+ "../../external-libs/flac/include",
);
INSTALL_PATH = /usr/local/lib;
PREBINDING = NO;
@@ -804,6 +825,10 @@
FLAC__ALIGN_MALLOC_DATA,
);
GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1 = "VERSION=\\\"1.1.3\\\"";
+ HEADER_SEARCH_PATHS = (
+ "$(inherited)",
+ "../../external-libs/flac/include",
+ );
INSTALL_PATH = /usr/local/lib;
PREBINDING = NO;
PRODUCT_NAME = "flac++";
@@ -826,6 +851,10 @@
FLAC__ALIGN_MALLOC_DATA,
);
GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1 = "VERSION=\\\"1.1.3\\\"";
+ HEADER_SEARCH_PATHS = (
+ "$(inherited)",
+ "../../external-libs/flac/include",
+ );
INSTALL_PATH = /usr/local/lib;
PREBINDING = NO;
PRODUCT_NAME = "flac++";
More information about the commits
mailing list