minor tweaks to allow building on Lion as 32bit (currently uses carbon, so 64bit is out)

This commit is contained in:
Mark Aufflick 2011-10-18 21:09:24 +11:00
parent df452fb5fe
commit 32ebad7ddb
5 changed files with 40 additions and 14 deletions

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
xcuserdata

View File

@ -363,9 +363,15 @@
2A37F4A9FDCFA73011CA2CEA /* Project object */ = {
isa = PBXProject;
buildConfigurationList = C05733CB08A9546B00998B17 /* Build configuration list for PBXProject "Catakig" */;
compatibilityVersion = "Xcode 2.4";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
en,
);
mainGroup = 2A37F4AAFDCFA73011CA2CEA /* Catakig */;
projectDirPath = "";
projectRoot = "";
targets = (
8D15AC270486D014006FF6A4 /* Catakig */,
);
@ -466,6 +472,13 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 286BC2C50AE685EE00A01672 /* debug.xcconfig */;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
GCC_VERSION = "";
MACOSX_DEPLOYMENT_TARGET = 10.7;
SDKROOT = macosx;
SDKROOT_i386 = /Developer/SDKs/MacOSX10.7.sdk;
SDKROOT_ppc = /Developer/SDKs/MacOSX10.7.sdk;
};
name = Debug;
};
@ -473,20 +486,35 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 286BC2C40AE685EE00A01672 /* release.xcconfig */;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
GCC_VERSION = "";
MACOSX_DEPLOYMENT_TARGET = 10.7;
SDKROOT = macosx;
SDKROOT_i386 = /Developer/SDKs/MacOSX10.7.sdk;
SDKROOT_ppc = /Developer/SDKs/MacOSX10.7.sdk;
};
name = Release;
};
C05733CC08A9546B00998B17 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
GCC_VERSION = com.apple.compilers.llvmgcc42;
SDKROOT = macosx;
VALID_ARCHS = i386;
};
name = Debug;
};
C05733CD08A9546B00998B17 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
GCC_VERSION = com.apple.compilers.llvmgcc42;
SDKROOT = macosx;
VALID_ARCHS = i386;
};
name = Release;
};

View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Workspace
version = "1.0">
<FileRef
location = "self:Catakig.xcodeproj">
</FileRef>
</Workspace>

View File

@ -8,6 +8,8 @@
#import "ScreenView.h"
#import "IndicatorLight.h"
#import <Carbon/Carbon.h>
@implementation ScreenView
//---------------------------------------------------------------------------

View File

@ -22,18 +22,6 @@ GCC_C_LANGUAGE_STANDARD = c99
GCC_ENABLE_OBJC_EXCEPTIONS = YES
//GCC_STRICT_ALIASING = YES
//GCC_VERSION = 4.0
GCC_VERSION_ppc = 4.0 // 3.3?
GCC_VERSION_i386 = 4.0
//SDKROOT = /Developer/SDKs/MacOSX10.3.9.sdk
SDKROOT_ppc = /Developer/SDKs/MacOSX10.3.9.sdk
SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk
//MACOSX_DEPLOYMENT_TARGET = 10.3
MACOSX_DEPLOYMENT_TARGET_ppc = 10.3
MACOSX_DEPLOYMENT_TARGET_i386 = 10.4
OTHER_LDFLAGS = -lz -lbz2
//OTHER_LDFLAGS = -flag1 -flag2 $(OTHER_LDFLAGS_$(CURRENT_ARCH))
//OTHER_LDFLAGS_ppc = -ppc_specific_flag