From 4e1d8b749d624851e407c2f899b5bce4500e77a5 Mon Sep 17 00:00:00 2001 From: stevenaaus Date: Sat, 24 Dec 2011 12:42:19 +0000 Subject: [PATCH] Add cfgfile.[hc] to xcode. git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@544 af15c1b1-3010-417e-b628-4374ebc0bcbd --- MacOSX/QuakeSpasm.xcodeproj/project.pbxproj | 75 +++++++++------------ 1 file changed, 31 insertions(+), 44 deletions(-) diff --git a/MacOSX/QuakeSpasm.xcodeproj/project.pbxproj b/MacOSX/QuakeSpasm.xcodeproj/project.pbxproj index 71afd83d..64dbbea9 100644 --- a/MacOSX/QuakeSpasm.xcodeproj/project.pbxproj +++ b/MacOSX/QuakeSpasm.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 44; + objectVersion = 45; objects = { /* Begin PBXAggregateTarget section */ @@ -116,6 +116,7 @@ 48FE585B0D3A82C8006BB491 /* QuakeArguments.m in Sources */ = {isa = PBXBuildFile; fileRef = 48FE585A0D3A82C8006BB491 /* QuakeArguments.m */; }; 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; }; 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; + B021C20914A5FF7E003F18D6 /* cfgfile.c in Sources */ = {isa = PBXBuildFile; fileRef = B021C20714A5FF7E003F18D6 /* cfgfile.c */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -150,6 +151,15 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 78B0CB9F14546F3A008C8212 /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 7; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ @@ -310,6 +320,8 @@ 48FE585A0D3A82C8006BB491 /* QuakeArguments.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QuakeArguments.m; sourceTree = ""; }; 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; }; 8D1107320486CEB800E47090 /* QuakeSpasm.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = QuakeSpasm.app; sourceTree = BUILT_PRODUCTS_DIR; }; + B021C20714A5FF7E003F18D6 /* cfgfile.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cfgfile.c; path = ../Quake/cfgfile.c; sourceTree = SOURCE_ROOT; }; + B021C20814A5FF7E003F18D6 /* cfgfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cfgfile.h; path = ../Quake/cfgfile.h; sourceTree = SOURCE_ROOT; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -426,6 +438,8 @@ 483A77D80D2EE8C500CB2E4C /* Quake */ = { isa = PBXGroup; children = ( + B021C20714A5FF7E003F18D6 /* cfgfile.c */, + B021C20814A5FF7E003F18D6 /* cfgfile.h */, 483A77D90D2EE8D400CB2E4C /* Generic */, 483A77DA0D2EE8DA00CB2E4C /* Input */, 483A77DD0D2EE8F100CB2E4C /* Network */, @@ -652,6 +666,7 @@ 8D11072C0486CEB800E47090 /* Sources */, 8D11072E0486CEB800E47090 /* Frameworks */, 002F39FD09D0883400EBEB88 /* Copy Frameworks into .app bundle */, + 78B0CB9F14546F3A008C8212 /* CopyFiles */, ); buildRules = ( ); @@ -669,8 +684,7 @@ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "QuakeSpasm" */; - compatibilityVersion = "Xcode 2.4"; - developmentRegion = English; + compatibilityVersion = "Xcode 3.1"; hasScannedForEncodings = 1; knownRegions = ( English, @@ -802,6 +816,7 @@ 4818B0B712D5BA1A006DD66E /* snd_vorbis.c in Sources */, 4818B0B812D5BA1A006DD66E /* snd_wave.c in Sources */, 4854B1B11340C646004C9F45 /* snd_mpg123.c in Sources */, + B021C20914A5FF7E003F18D6 /* cfgfile.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -861,10 +876,7 @@ C01FCF4B08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - x86_64, - i386, - ); + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -897,11 +909,7 @@ C01FCF4C08A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - i386, - x86_64, - ppc, - ); + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", @@ -953,27 +961,24 @@ C01FCF4F08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - i386, - x86_64, - ); + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; FRAMEWORK_SEARCH_PATHS = ( /Library/Frameworks, "$(FRAMEWORK_SEARCH_PATHS)", ); GCC_MODEL_TUNING = G3; GCC_PREPROCESSOR_DEFINITIONS = USE_QS_CONBACK; + GCC_VERSION = 4.0; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ( - /opt/local/include, /Library/Frameworks/SDL.framework/Headers, "$(HEADER_SEARCH_PATHS)", ); - LIBRARY_SEARCH_PATHS = /opt/local/lib; + LIBRARY_SEARCH_PATHS = ""; ONLY_ACTIVE_ARCH = NO; PREBINDING = NO; - SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk"; + SDKROOT = macosx10.5; VALID_ARCHS = "i386 x86_64"; }; name = Debug; @@ -981,11 +986,7 @@ C01FCF5008A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - x86_64, - i386, - ppc, - ); + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; FRAMEWORK_SEARCH_PATHS = ( /Library/Frameworks, "$(FRAMEWORK_SEARCH_PATHS)", @@ -997,36 +998,22 @@ USE_CODEC_WAVE, USE_QS_CONBACK, ); + GCC_VERSION = 4.0; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = ( - include, /Library/Frameworks/SDL.framework/Headers, "$(HEADER_SEARCH_PATHS)", ); - LIBRARY_SEARCH_PATHS = /opt/local/lib; + LIBRARY_SEARCH_PATHS = ""; ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = ""; - "OTHER_CFLAGS[arch=ppc64]" = ( - "-arch", - ppc, - ); - "OTHER_CFLAGS[arch=ppc]" = ( - "-arch", - ppc, - ); OTHER_LDFLAGS = ""; - "OTHER_LDFLAGS[arch=ppc64]" = ( - "-arch", - ppc, - ); - "OTHER_LDFLAGS[arch=ppc]" = ( - "-arch", - ppc, - ); + "OTHER_LDFLAGS[arch=i386]" = ""; + "OTHER_LDFLAGS[sdk=macosx10.5][arch=i386]" = ""; PREBINDING = NO; - SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk"; - VALID_ARCHS = "i386 x86_64 ppc ppc64 ppc7400 ppc970"; + SDKROOT = macosx10.5; + VALID_ARCHS = "i386 x86_64"; }; name = Release; };