Permalink
Browse files

Merge pull request #1 from BergQuester/master

Updated project to build under 4.4
  • Loading branch information...
2 parents af9c2c8 + 13d3c73 commit 6c1c3908bc9ffba4131ec42622918dae86be8c93 @mikeash committed Aug 22, 2012
Showing with 35 additions and 46 deletions.
  1. +32 −39 GPULife.xcodeproj/project.pbxproj
  2. +3 −7 GPULifeView.m
View
71 GPULife.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 42;
+ objectVersion = 46;
objects = {
/* Begin PBXBuildFile section */
@@ -210,9 +210,16 @@
/* Begin PBXProject section */
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
+ attributes = {
+ LastUpgradeCheck = 0440;
+ };
buildConfigurationList = C2D820560897ABEC008CB8EC /* Build configuration list for PBXProject "GPULife" */;
- compatibilityVersion = "Xcode 2.4";
+ compatibilityVersion = "Xcode 3.2";
+ developmentRegion = English;
hasScannedForEncodings = 1;
+ knownRegions = (
+ en,
+ );
mainGroup = 29B97314FDCFA39411CA2CEA /* GPULife */;
projectDirPath = "";
projectRoot = "";
@@ -297,11 +304,10 @@
C2D8204F0897ABEC008CB8EC /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(NATIVE_ARCH_ACTUAL)";
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
- GCC_ENABLE_OBJC_GC = YES;
+ GCC_ENABLE_OBJC_GC = supported;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -310,9 +316,8 @@
GCC_WARN_UNUSED_VARIABLE = YES;
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Applications";
- PREBINDING = NO;
PRODUCT_NAME = GPULife;
- SDKROOT_x86_64 = /Developer/SDKs/MacOSX10.6.sdk;
+ SDKROOT_x86_64 = "";
WARNING_CFLAGS = (
"-W",
"-Wall",
@@ -326,21 +331,15 @@
C2D820500897ABEC008CB8EC /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = (
- x86_64,
- ppc,
- i386,
- );
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = GPULife_Prefix.pch;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(HOME)/Applications";
- PREBINDING = NO;
PRODUCT_NAME = GPULife;
WARNING_CFLAGS = (
"-W",
@@ -355,6 +354,7 @@
C2D820510897ABEC008CB8EC /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ COMBINE_HIDPI_IMAGES = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = GPULife_Prefix.pch;
@@ -375,11 +375,10 @@
C2D820530897ABEC008CB8EC /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(NATIVE_ARCH_ACTUAL)";
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
- GCC_ENABLE_OBJC_GC = YES;
+ GCC_ENABLE_OBJC_GC = supported;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_MODEL_TUNING = G4;
GCC_OPTIMIZATION_LEVEL = 0;
@@ -391,9 +390,8 @@
OTHER_CFLAGS = "";
OTHER_LDFLAGS = "";
OTHER_REZFLAGS = "";
- PREBINDING = NO;
PRODUCT_NAME = GPULife;
- SDKROOT_x86_64 = /Developer/SDKs/MacOSX10.6.sdk;
+ SDKROOT_x86_64 = "";
SECTORDER_FLAGS = "";
WARNING_CFLAGS = (
"-W",
@@ -408,14 +406,9 @@
C2D820540897ABEC008CB8EC /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = (
- x86_64,
- ppc,
- i386,
- );
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
- GCC_ENABLE_OBJC_GC = YES;
+ GCC_ENABLE_OBJC_GC = supported;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = G4;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -426,9 +419,8 @@
OTHER_CFLAGS = "";
OTHER_LDFLAGS = "";
OTHER_REZFLAGS = "";
- PREBINDING = NO;
PRODUCT_NAME = GPULife;
- SDKROOT_x86_64 = /Developer/SDKs/MacOSX10.6.sdk;
+ SDKROOT_x86_64 = "";
SECTORDER_FLAGS = "";
WARNING_CFLAGS = (
"-W",
@@ -443,7 +435,8 @@
C2D820550897ABEC008CB8EC /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
- GCC_ENABLE_OBJC_GC = YES;
+ COMBINE_HIDPI_IMAGES = YES;
+ GCC_ENABLE_OBJC_GC = supported;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_MODEL_TUNING = G4;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -454,9 +447,8 @@
OTHER_CFLAGS = "";
OTHER_LDFLAGS = "";
OTHER_REZFLAGS = "";
- PREBINDING = NO;
PRODUCT_NAME = GPULife;
- SDKROOT_x86_64 = /Developer/SDKs/MacOSX10.6.sdk;
+ SDKROOT_x86_64 = "";
SECTORDER_FLAGS = "";
WARNING_CFLAGS = (
"-W",
@@ -470,26 +462,27 @@
C2D820570897ABEC008CB8EC /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
- SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ SDKROOT = macosx10.7;
};
name = Development;
};
C2D820580897ABEC008CB8EC /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = (
- ppc,
- i386,
- );
- GCC_VERSION = 4.0;
- SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ SDKROOT = macosx10.7;
};
name = Deployment;
};
C2D820590897ABEC008CB8EC /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
- SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+ GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+ SDKROOT = macosx10.7;
};
name = Default;
};
View
10 GPULifeView.m
@@ -88,7 +88,7 @@ - (void)setCornerColors:(GPULifeColor3 *)c
memcpy(cornerColors, c, sizeof(cornerColors));
}
-- (void)setFPSTarget:o selector:(SEL)s;
+- (void)setFPSTarget:o selector:(SEL)s
{
if([o respondsToSelector:s])
{
@@ -212,12 +212,8 @@ - (void)timer
double curTime(void)
{
static struct mach_timebase_info timebase;
- int timebaseInited = 0;
- if(!timebaseInited)
- {
- timebaseInited = 1;
- mach_timebase_info(&timebase);
- }
+ mach_timebase_info(&timebase);
+
return (double)((mach_absolute_time() * timebase.numer) / timebase.denom) / 1000.0;
}

0 comments on commit 6c1c390

Please sign in to comment.