From bb2f6a8a8fce64986a08f0b31bb1f5316233fd3e Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Sat, 10 Oct 2009 10:17:48 +0200 Subject: Revert xcodeproj to before my changes and add the missing source files cleanly. Both tiles and console version compile. --- crawl-ref/source/Crawl.xcodeproj/project.pbxproj | 88 +++++++++++------------- 1 file changed, 42 insertions(+), 46 deletions(-) (limited to 'crawl-ref/source/Crawl.xcodeproj') diff --git a/crawl-ref/source/Crawl.xcodeproj/project.pbxproj b/crawl-ref/source/Crawl.xcodeproj/project.pbxproj index afc843f0da..983646792c 100644 --- a/crawl-ref/source/Crawl.xcodeproj/project.pbxproj +++ b/crawl-ref/source/Crawl.xcodeproj/project.pbxproj @@ -386,16 +386,16 @@ D2AE25F90DA262DD00E15489 /* crawl in Copy Wrapper Script */ = {isa = PBXBuildFile; fileRef = D2AE25EE0DA2624E00E15489 /* crawl */; }; D2F272350DA1C5AD00445FE9 /* dat in Resources */ = {isa = PBXBuildFile; fileRef = D2F271FE0DA1C5AD00445FE9 /* dat */; }; D2F2725B0DA1C61600445FE9 /* docs in Resources */ = {isa = PBXBuildFile; fileRef = D2F2723F0DA1C61600445FE9 /* docs */; }; - E1424F74107FAE1100E2A9CD /* ctest.cc in Sources */ = {isa = PBXBuildFile; fileRef = B0CFB313106DF67F005F9CC3 /* ctest.cc */; }; - E1424F75107FAE4900E2A9CD /* los.cc in Sources */ = {isa = PBXBuildFile; fileRef = E14D930A107FA77200E3F5FE /* los.cc */; }; - E1424F7E107FAEC700E2A9CD /* losparam.cc in Sources */ = {isa = PBXBuildFile; fileRef = E14D930B107FA77200E3F5FE /* losparam.cc */; }; - E1424F7F107FAEC700E2A9CD /* mon-los.cc in Sources */ = {isa = PBXBuildFile; fileRef = E14D930C107FA77200E3F5FE /* mon-los.cc */; }; - E1424F80107FAEC700E2A9CD /* ray.cc in Sources */ = {isa = PBXBuildFile; fileRef = E14D930D107FA77200E3F5FE /* ray.cc */; }; - E14D930F107FA77200E3F5FE /* los.cc in Sources */ = {isa = PBXBuildFile; fileRef = E14D930A107FA77200E3F5FE /* los.cc */; }; - E14D9310107FA77200E3F5FE /* losparam.cc in Sources */ = {isa = PBXBuildFile; fileRef = E14D930B107FA77200E3F5FE /* losparam.cc */; }; - E14D9311107FA77200E3F5FE /* mon-los.cc in Sources */ = {isa = PBXBuildFile; fileRef = E14D930C107FA77200E3F5FE /* mon-los.cc */; }; - E14D9312107FA77200E3F5FE /* ray.cc in Sources */ = {isa = PBXBuildFile; fileRef = E14D930D107FA77200E3F5FE /* ray.cc */; }; - E14D9313107FA77200E3F5FE /* sha256.cc in Sources */ = {isa = PBXBuildFile; fileRef = E14D930E107FA77200E3F5FE /* sha256.cc */; }; + E1467F6B108078CF00ECA727 /* los.cc in Sources */ = {isa = PBXBuildFile; fileRef = E1467F66108078CF00ECA727 /* los.cc */; }; + E1467F6C108078CF00ECA727 /* losparam.cc in Sources */ = {isa = PBXBuildFile; fileRef = E1467F67108078CF00ECA727 /* losparam.cc */; }; + E1467F6D108078CF00ECA727 /* mon-los.cc in Sources */ = {isa = PBXBuildFile; fileRef = E1467F68108078CF00ECA727 /* mon-los.cc */; }; + E1467F6E108078CF00ECA727 /* ray.cc in Sources */ = {isa = PBXBuildFile; fileRef = E1467F69108078CF00ECA727 /* ray.cc */; }; + E1467F6F108078CF00ECA727 /* sha256.cc in Sources */ = {isa = PBXBuildFile; fileRef = E1467F6A108078CF00ECA727 /* sha256.cc */; }; + E1467F70108078CF00ECA727 /* los.cc in Sources */ = {isa = PBXBuildFile; fileRef = E1467F66108078CF00ECA727 /* los.cc */; }; + E1467F71108078CF00ECA727 /* losparam.cc in Sources */ = {isa = PBXBuildFile; fileRef = E1467F67108078CF00ECA727 /* losparam.cc */; }; + E1467F72108078CF00ECA727 /* mon-los.cc in Sources */ = {isa = PBXBuildFile; fileRef = E1467F68108078CF00ECA727 /* mon-los.cc */; }; + E1467F73108078CF00ECA727 /* ray.cc in Sources */ = {isa = PBXBuildFile; fileRef = E1467F69108078CF00ECA727 /* ray.cc */; }; + E1467F74108078CF00ECA727 /* sha256.cc in Sources */ = {isa = PBXBuildFile; fileRef = E1467F6A108078CF00ECA727 /* sha256.cc */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -918,11 +918,11 @@ D2F271F80DA1C58C00445FE9 /* Crawl-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Crawl-Info.plist"; sourceTree = ""; }; D2F271FE0DA1C5AD00445FE9 /* dat */ = {isa = PBXFileReference; lastKnownFileType = folder; path = dat; sourceTree = ""; }; D2F2723F0DA1C61600445FE9 /* docs */ = {isa = PBXFileReference; lastKnownFileType = folder; name = docs; path = ../docs; sourceTree = SOURCE_ROOT; }; - E14D930A107FA77200E3F5FE /* los.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = los.cc; sourceTree = ""; }; - E14D930B107FA77200E3F5FE /* losparam.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = losparam.cc; sourceTree = ""; }; - E14D930C107FA77200E3F5FE /* mon-los.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "mon-los.cc"; sourceTree = ""; }; - E14D930D107FA77200E3F5FE /* ray.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ray.cc; sourceTree = ""; }; - E14D930E107FA77200E3F5FE /* sha256.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sha256.cc; sourceTree = ""; }; + E1467F66108078CF00ECA727 /* los.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = los.cc; sourceTree = ""; }; + E1467F67108078CF00ECA727 /* losparam.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = losparam.cc; sourceTree = ""; }; + E1467F68108078CF00ECA727 /* mon-los.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "mon-los.cc"; sourceTree = ""; }; + E1467F69108078CF00ECA727 /* ray.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ray.cc; sourceTree = ""; }; + E1467F6A108078CF00ECA727 /* sha256.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sha256.cc; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -1084,11 +1084,11 @@ 7B352EF00B001F5B00CABB32 /* Crawl */ = { isa = PBXGroup; children = ( - E14D930A107FA77200E3F5FE /* los.cc */, - E14D930B107FA77200E3F5FE /* losparam.cc */, - E14D930C107FA77200E3F5FE /* mon-los.cc */, - E14D930D107FA77200E3F5FE /* ray.cc */, - E14D930E107FA77200E3F5FE /* sha256.cc */, + E1467F66108078CF00ECA727 /* los.cc */, + E1467F67108078CF00ECA727 /* losparam.cc */, + E1467F68108078CF00ECA727 /* mon-los.cc */, + E1467F69108078CF00ECA727 /* ray.cc */, + E1467F6A108078CF00ECA727 /* sha256.cc */, B07818DC1075D979008C3B64 /* sqldbm.cc */, B07818DD1075D979008C3B64 /* sqldbm.h */, B0826648107333BB006EEC5A /* AppHdr.h */, @@ -1662,10 +1662,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - E14D9310107FA77200E3F5FE /* losparam.cc in Sources */, - E14D9311107FA77200E3F5FE /* mon-los.cc in Sources */, - E14D9312107FA77200E3F5FE /* ray.cc in Sources */, - E1424F74107FAE1100E2A9CD /* ctest.cc in Sources */, 7BBC4A080B0F783C00F27D45 /* levcomp.ypp in Sources */, 7BBC4A070B0F783C00F27D45 /* levcomp.lpp in Sources */, 7B237E6D0A8EC9D000580F30 /* maps.cc in Sources */, @@ -1761,8 +1757,11 @@ D274AC5A0FE66EFC00C9C1AE /* spl-mis.cc in Sources */, D2A72B2A101173C000E1A883 /* artefact.cc in Sources */, B07818DF1075D979008C3B64 /* sqldbm.cc in Sources */, - E14D930F107FA77200E3F5FE /* los.cc in Sources */, - E14D9313107FA77200E3F5FE /* sha256.cc in Sources */, + E1467F6B108078CF00ECA727 /* los.cc in Sources */, + E1467F6C108078CF00ECA727 /* losparam.cc in Sources */, + E1467F6D108078CF00ECA727 /* mon-los.cc in Sources */, + E1467F6E108078CF00ECA727 /* ray.cc in Sources */, + E1467F6F108078CF00ECA727 /* sha256.cc in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1770,10 +1769,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - E1424F7E107FAEC700E2A9CD /* losparam.cc in Sources */, - E1424F7F107FAEC700E2A9CD /* mon-los.cc in Sources */, - E1424F80107FAEC700E2A9CD /* ray.cc in Sources */, - E1424F75107FAE4900E2A9CD /* los.cc in Sources */, B032D68F106C02150002D70D /* levcomp.ypp in Sources */, B032D690106C02150002D70D /* levcomp.lpp in Sources */, B032D691106C02150002D70D /* SDLMain.m in Sources */, @@ -1885,6 +1880,11 @@ B0CFB315106DF67F005F9CC3 /* ctest.cc in Sources */, B082657810731AB5006EEC5A /* sqlite3.c in Sources */, B07818DE1075D979008C3B64 /* sqldbm.cc in Sources */, + E1467F70108078CF00ECA727 /* los.cc in Sources */, + E1467F71108078CF00ECA727 /* losparam.cc in Sources */, + E1467F72108078CF00ECA727 /* mon-los.cc in Sources */, + E1467F73108078CF00ECA727 /* ray.cc in Sources */, + E1467F74108078CF00ECA727 /* sha256.cc in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1961,7 +1961,6 @@ 1DEB928A08733DD80010E9CD /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(NATIVE_ARCH)"; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_OPTIMIZATION_LEVEL = 2; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -1994,12 +1993,12 @@ GCC_WARN_UNUSED_VARIABLE = YES; MACOSX_DEPLOYMENT_TARGET_i386 = 10.4; MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; - MACOSX_DEPLOYMENT_TARGET_x86_64 = 10.6; + MACOSX_DEPLOYMENT_TARGET_x86_64 = 10.5; PREBINDING = NO; - SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; + SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk"; SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk; SDKROOT_ppc = /Developer/SDKs/MacOSX10.4u.sdk; - SDKROOT_x86_64 = /Developer/SDKs/MacOSX10.6.sdk; + SDKROOT_x86_64 = /Developer/SDKs/MacOSX10.5.sdk; WARNING_CFLAGS = ""; }; name = Development; @@ -2092,7 +2091,6 @@ 7B97C0200A8ECFD700CE8936 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(NATIVE_ARCH)"; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -2125,12 +2123,12 @@ GCC_WARN_UNUSED_VARIABLE = YES; MACOSX_DEPLOYMENT_TARGET_i386 = 10.4; MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; - MACOSX_DEPLOYMENT_TARGET_x86_64 = 10.6; + MACOSX_DEPLOYMENT_TARGET_x86_64 = 10.5; PREBINDING = NO; - SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; + SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk"; SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk; SDKROOT_ppc = /Developer/SDKs/MacOSX10.4u.sdk; - SDKROOT_x86_64 = /Developer/SDKs/MacOSX10.6.sdk; + SDKROOT_x86_64 = /Developer/SDKs/MacOSX10.5.sdk; WARNING_CFLAGS = ""; }; name = Debug; @@ -2163,8 +2161,6 @@ 7B97C0250A8ED2AB00CE8936 /* Wizard */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_PREPROCESSOR_DEFINITIONS = ( OSX, @@ -2195,12 +2191,12 @@ GCC_WARN_UNUSED_VARIABLE = YES; MACOSX_DEPLOYMENT_TARGET_i386 = 10.4; MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; - MACOSX_DEPLOYMENT_TARGET_x86_64 = 10.6; + MACOSX_DEPLOYMENT_TARGET_x86_64 = 10.5; PREBINDING = NO; - SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; + SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk"; SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk; SDKROOT_ppc = /Developer/SDKs/MacOSX10.4u.sdk; - SDKROOT_x86_64 = /Developer/SDKs/MacOSX10.6.sdk; + SDKROOT_x86_64 = /Developer/SDKs/MacOSX10.5.sdk; WARNING_CFLAGS = ""; }; name = Wizard; @@ -2258,12 +2254,12 @@ GCC_WARN_UNUSED_VARIABLE = YES; MACOSX_DEPLOYMENT_TARGET_i386 = 10.4; MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; - MACOSX_DEPLOYMENT_TARGET_x86_64 = 10.6; + MACOSX_DEPLOYMENT_TARGET_x86_64 = 10.5; PREBINDING = NO; - SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; + SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk"; SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk; SDKROOT_ppc = /Developer/SDKs/MacOSX10.4u.sdk; - SDKROOT_x86_64 = /Developer/SDKs/MacOSX10.6.sdk; + SDKROOT_x86_64 = /Developer/SDKs/MacOSX10.5.sdk; WARNING_CFLAGS = ""; }; name = Release; -- cgit v1.2.3-54-g00ecf