diff -r 851de24ecb61 -r f2cd752db494 Ottoman.xcodeproj/project.pbxproj --- a/Ottoman.xcodeproj/project.pbxproj Sun Sep 20 21:25:47 2009 -0700 +++ b/Ottoman.xcodeproj/project.pbxproj Thu Sep 24 21:47:06 2009 -0700 @@ -8,6 +8,11 @@ /* Begin PBXBuildFile section */ 27156CAA104C9C44009EBD39 /* gtest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 27156CA9104C9C44009EBD39 /* gtest.framework */; }; + 2754DD87106BCBCF00365FAA /* MYOttoman_test.m in Sources */ = {isa = PBXBuildFile; fileRef = 2754DD86106BCBCF00365FAA /* MYOttoman_test.m */; }; + 2754DDC5106BD20A00365FAA /* Test.m in Sources */ = {isa = PBXBuildFile; fileRef = 2754DDC4106BD20A00365FAA /* Test.m */; }; + 2754DDEE106BD3BD00365FAA /* Logging.m in Sources */ = {isa = PBXBuildFile; fileRef = 2754DDED106BD3BD00365FAA /* Logging.m */; }; + 2754DDF3106BD3D300365FAA /* ExceptionUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 2754DDF2106BD3D300365FAA /* ExceptionUtils.m */; }; + 2754DE2D106BD65600365FAA /* CollectionUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 2754DE2C106BD65600365FAA /* CollectionUtils.m */; }; 27603901105AC81200D931A7 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 27603900105AC81200D931A7 /* CoreFoundation.framework */; }; 276E5BCD1066D13D008A2171 /* Base.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 276E5BC41066D13D008A2171 /* Base.cpp */; }; 276E5BCE1066D13D008A2171 /* Chunk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 276E5BC51066D13D008A2171 /* Chunk.cpp */; }; @@ -41,8 +46,21 @@ 276E5CC4106731C7008A2171 /* File.h in Headers */ = {isa = PBXBuildFile; fileRef = 276E5BBD1066D135008A2171 /* File.h */; }; 276E5CC5106731C8008A2171 /* Ottoman.h in Headers */ = {isa = PBXBuildFile; fileRef = 276E5BC11066D135008A2171 /* Ottoman.h */; }; 276E5CC6106731C8008A2171 /* VersionDictionary.h in Headers */ = {isa = PBXBuildFile; fileRef = 276E5BC21066D135008A2171 /* VersionDictionary.h */; }; + 276E5D141067D2AD008A2171 /* MYOttoman.mm in Sources */ = {isa = PBXBuildFile; fileRef = 276E5D0A1067D24A008A2171 /* MYOttoman.mm */; }; + 276E5D151067D2B2008A2171 /* libOttoman.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 276E5CAE1067315D008A2171 /* libOttoman.a */; }; + 276E5D2E1067F86E008A2171 /* MYVersionDictionary.mm in Sources */ = {isa = PBXBuildFile; fileRef = 276E5D2D1067F86E008A2171 /* MYVersionDictionary.mm */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + 276E5D7810692FA7008A2171 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 276E5CAD1067315D008A2171; + remoteInfo = "Static Library"; + }; +/* End PBXContainerItemProxy section */ + /* Begin PBXCopyFilesBuildPhase section */ 8DD76F690486A84900D96B5E /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; @@ -57,6 +75,15 @@ /* Begin PBXFileReference section */ 27156CA9104C9C44009EBD39 /* gtest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = gtest.framework; path = /Library/Frameworks/gtest.framework; sourceTree = ""; }; + 2754DD86106BCBCF00365FAA /* MYOttoman_test.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MYOttoman_test.m; sourceTree = ""; }; + 2754DDC3106BD20A00365FAA /* Test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Test.h; sourceTree = ""; }; + 2754DDC4106BD20A00365FAA /* Test.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Test.m; sourceTree = ""; }; + 2754DDEC106BD3BD00365FAA /* Logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Logging.h; sourceTree = ""; }; + 2754DDED106BD3BD00365FAA /* Logging.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Logging.m; sourceTree = ""; }; + 2754DDF1106BD3D300365FAA /* ExceptionUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExceptionUtils.h; sourceTree = ""; }; + 2754DDF2106BD3D300365FAA /* ExceptionUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ExceptionUtils.m; sourceTree = ""; }; + 2754DE2B106BD65600365FAA /* CollectionUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CollectionUtils.h; sourceTree = ""; }; + 2754DE2C106BD65600365FAA /* CollectionUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CollectionUtils.m; sourceTree = ""; }; 27603900105AC81200D931A7 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; }; 276E5BBA1066D135008A2171 /* Base.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Base.h; sourceTree = ""; }; 276E5BBB1066D135008A2171 /* Chunk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Chunk.h; sourceTree = ""; }; @@ -83,6 +110,12 @@ 276E5BDB1066D142008A2171 /* TestUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestUtils.h; sourceTree = ""; }; 276E5BDC1066D142008A2171 /* VersionDictionary_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VersionDictionary_test.cpp; sourceTree = ""; }; 276E5CAE1067315D008A2171 /* libOttoman.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libOttoman.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 276E5D091067D24A008A2171 /* MYOttoman.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MYOttoman.h; sourceTree = ""; }; + 276E5D0A1067D24A008A2171 /* MYOttoman.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MYOttoman.mm; sourceTree = ""; }; + 276E5D101067D27E008A2171 /* OttomanCocoa */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = OttomanCocoa; sourceTree = BUILT_PRODUCTS_DIR; }; + 276E5D2C1067F86E008A2171 /* MYVersionDictionary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MYVersionDictionary.h; sourceTree = ""; }; + 276E5D2D1067F86E008A2171 /* MYVersionDictionary.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MYVersionDictionary.mm; sourceTree = ""; }; + 276E5D451069246E008A2171 /* MYOttoman_internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MYOttoman_internal.h; sourceTree = ""; }; 8DD76F6C0486A84900D96B5E /* OttomanTest */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = OttomanTest; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -94,6 +127,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 276E5D0E1067D27E008A2171 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 276E5D151067D2B2008A2171 /* libOttoman.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 8DD76F660486A84900D96B5E /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -109,6 +150,7 @@ 08FB7794FE84155DC02AAC07 /* BPlusTree */ = { isa = PBXGroup; children = ( + 276E5D081067D20B008A2171 /* Cocoa */, 276E5BB91066D135008A2171 /* include */, 276E5BC31066D13D008A2171 /* src */, 276E5BD61066D142008A2171 /* test */, @@ -124,10 +166,27 @@ children = ( 8DD76F6C0486A84900D96B5E /* OttomanTest */, 276E5CAE1067315D008A2171 /* libOttoman.a */, + 276E5D101067D27E008A2171 /* OttomanCocoa */, ); name = Products; sourceTree = ""; }; + 2754DDEB106BD38600365FAA /* MYUtilities */ = { + isa = PBXGroup; + children = ( + 2754DE2B106BD65600365FAA /* CollectionUtils.h */, + 2754DE2C106BD65600365FAA /* CollectionUtils.m */, + 2754DDF1106BD3D300365FAA /* ExceptionUtils.h */, + 2754DDF2106BD3D300365FAA /* ExceptionUtils.m */, + 2754DDEC106BD3BD00365FAA /* Logging.h */, + 2754DDED106BD3BD00365FAA /* Logging.m */, + 2754DDC3106BD20A00365FAA /* Test.h */, + 2754DDC4106BD20A00365FAA /* Test.m */, + ); + name = MYUtilities; + path = /Volumes/snoog/Code/MYUtilities; + sourceTree = ""; + }; 276E5BB91066D135008A2171 /* include */ = { isa = PBXGroup; children = ( @@ -173,6 +232,21 @@ path = test; sourceTree = ""; }; + 276E5D081067D20B008A2171 /* Cocoa */ = { + isa = PBXGroup; + children = ( + 276E5D091067D24A008A2171 /* MYOttoman.h */, + 276E5D0A1067D24A008A2171 /* MYOttoman.mm */, + 276E5D2C1067F86E008A2171 /* MYVersionDictionary.h */, + 276E5D2D1067F86E008A2171 /* MYVersionDictionary.mm */, + 276E5D451069246E008A2171 /* MYOttoman_internal.h */, + 2754DD86106BCBCF00365FAA /* MYOttoman_test.m */, + 2754DDEB106BD38600365FAA /* MYUtilities */, + ); + name = Cocoa; + path = bindings/Cocoa; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -212,6 +286,23 @@ productReference = 276E5CAE1067315D008A2171 /* libOttoman.a */; productType = "com.apple.product-type.library.static"; }; + 276E5D0F1067D27E008A2171 /* Cocoa */ = { + isa = PBXNativeTarget; + buildConfigurationList = 276E5D161067D2D1008A2171 /* Build configuration list for PBXNativeTarget "Cocoa" */; + buildPhases = ( + 276E5D0D1067D27E008A2171 /* Sources */, + 276E5D0E1067D27E008A2171 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + 276E5D7910692FA7008A2171 /* PBXTargetDependency */, + ); + name = Cocoa; + productName = Cocoa; + productReference = 276E5D101067D27E008A2171 /* OttomanCocoa */; + productType = "com.apple.product-type.tool"; + }; 8DD76F620486A84900D96B5E /* OttomanTest */ = { isa = PBXNativeTarget; buildConfigurationList = 1DEB923108733DC60010E9CD /* Build configuration list for PBXNativeTarget "OttomanTest" */; @@ -244,6 +335,7 @@ targets = ( 8DD76F620486A84900D96B5E /* OttomanTest */, 276E5CAD1067315D008A2171 /* Static Library */, + 276E5D0F1067D27E008A2171 /* Cocoa */, ); }; /* End PBXProject section */ @@ -265,6 +357,20 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 276E5D0D1067D27E008A2171 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 276E5D141067D2AD008A2171 /* MYOttoman.mm in Sources */, + 276E5D2E1067F86E008A2171 /* MYVersionDictionary.mm in Sources */, + 2754DD87106BCBCF00365FAA /* MYOttoman_test.m in Sources */, + 2754DDC5106BD20A00365FAA /* Test.m in Sources */, + 2754DDEE106BD3BD00365FAA /* Logging.m in Sources */, + 2754DDF3106BD3D300365FAA /* ExceptionUtils.m in Sources */, + 2754DE2D106BD65600365FAA /* CollectionUtils.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 8DD76F640486A84900D96B5E /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -288,6 +394,14 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + 276E5D7910692FA7008A2171 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 276E5CAD1067315D008A2171 /* Static Library */; + targetProxy = 276E5D7810692FA7008A2171 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin XCBuildConfiguration section */ 1DEB923208733DC60010E9CD /* Debug */ = { isa = XCBuildConfiguration; @@ -320,6 +434,7 @@ buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; GCC_C_LANGUAGE_STANDARD = c99; + GCC_INLINES_ARE_PRIVATE_EXTERN = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREPROCESSOR_DEFINITIONS = ""; @@ -345,6 +460,7 @@ GCC_C_LANGUAGE_STANDARD = c99; GCC_DYNAMIC_NO_PIC = YES; GCC_ENABLE_CPP_RTTI = NO; + GCC_INLINES_ARE_PRIVATE_EXTERN = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREPROCESSOR_DEFINITIONS = NDEBUG; GCC_TREAT_WARNINGS_AS_ERRORS = YES; @@ -380,12 +496,43 @@ buildSettings = { COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GENERATE_MASTER_OBJECT_FILE = YES; INSTALL_PATH = /usr/local/lib; PRODUCT_NAME = Ottoman; }; name = Release; }; + 276E5D121067D27F008A2171 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + GCC_PRECOMPILE_PREFIX_HEADER = NO; + GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Foundation.framework/Headers/Foundation.h"; + GCC_PREPROCESSOR_DEFINITIONS = DEBUG; + INSTALL_PATH = /usr/local/bin; + OTHER_LDFLAGS = ( + "-framework", + Foundation, + ); + PRODUCT_NAME = OttomanCocoa; + }; + name = Debug; + }; + 276E5D131067D27F008A2171 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = YES; + GCC_PRECOMPILE_PREFIX_HEADER = NO; + GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Foundation.framework/Headers/Foundation.h"; + GCC_PREPROCESSOR_DEFINITIONS = DEBUG; + INSTALL_PATH = /usr/local/bin; + OTHER_LDFLAGS = ( + "-framework", + Foundation, + ); + PRODUCT_NAME = OttomanCocoa; + }; + name = Release; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -416,6 +563,15 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + 276E5D161067D2D1008A2171 /* Build configuration list for PBXNativeTarget "Cocoa" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 276E5D121067D27F008A2171 /* Debug */, + 276E5D131067D27F008A2171 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; /* End XCConfigurationList section */ }; rootObject = 08FB7793FE84155DC02AAC07 /* Project object */;