Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Build cleanly with Xcode 4 #4

Merged
merged 7 commits into from

2 participants

@kamitchell

These changes mainly add Xcode 4 metadata and fix up some warnings from the newer compiler.

Blitz has been tested and used at a conference while running on Lion, so I guess this means it's now Lion-compatible.

@rentzsch
Owner

Thanks Kevin!

@rentzsch rentzsch merged commit 2753245 into rentzsch:master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Sep 23, 2011
  1. @kamitchell

    Add Xcode 4 workspace data.

    kamitchell authored
  2. @kamitchell

    Project setting changes requested by Xcode 4.1

    kamitchell authored
    - remove obsolete settings PREBINDING and GCC_ENABLE_FIX_AND_CONTINUE
    
    - Use 10.7 SDK
  3. @kamitchell
  4. @kamitchell

    Fix up ambiguity in set method

    kamitchell authored
    - Make LLVM compiler happy.
  5. @kamitchell

    Fix warnings about pageIndex setter.

    kamitchell authored
    - Found in LLVM with Xcode 4.1
  6. @kamitchell
  7. @kamitchell
This page is out of date. Refresh to see the latest.
View
3  .gitignore
@@ -1,5 +1,6 @@
build
-
+xcuserdata
+
*.pbxuser
*.perspectivev3
*.mode1v3
View
21 Blitz.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
- objectVersion = 45;
+ objectVersion = 46;
objects = {
/* Begin PBXBuildFile section */
@@ -262,8 +262,12 @@
/* Begin PBXProject section */
2A37F4A9FDCFA73011CA2CEA /* Project object */ = {
isa = PBXProject;
+ attributes = {
+ LastUpgradeCheck = 0410;
+ };
buildConfigurationList = C05733CB08A9546B00998B17 /* Build configuration list for PBXProject "Blitz" */;
- compatibilityVersion = "Xcode 3.1";
+ compatibilityVersion = "Xcode 3.2";
+ developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
English,
@@ -385,7 +389,6 @@
"\"$(SRCROOT)\"",
);
GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -397,7 +400,7 @@
"-DNS_BUILD_32_LIKE_64",
);
PRODUCT_NAME = Blitz;
- SDKROOT = macosx10.6;
+ SDKROOT = macosx;
};
name = Debug;
};
@@ -420,7 +423,7 @@
"-DNS_BUILD_32_LIKE_64",
);
PRODUCT_NAME = Blitz;
- SDKROOT = macosx10.5;
+ SDKROOT = macosx;
};
name = Release;
};
@@ -432,10 +435,10 @@
GCC_OPTIMIZATION_LEVEL = 0;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
+ MACOSX_DEPLOYMENT_TARGET = 10.5;
ONLY_ACTIVE_ARCH = YES;
- PREBINDING = NO;
PRODUCT_VERSION = 1.0;
- SDKROOT = macosx10.6;
+ SDKROOT = macosx;
};
name = Debug;
};
@@ -449,9 +452,9 @@
GCC_C_LANGUAGE_STANDARD = c99;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- PREBINDING = NO;
+ MACOSX_DEPLOYMENT_TARGET = 10.5;
PRODUCT_VERSION = 1.0;
- SDKROOT = macosx10.6;
+ SDKROOT = macosx;
};
name = Release;
};
View
6 Blitz.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace>
+ <FileRef
+ location = "self:Blitz.xcodeproj">
+ </FileRef>
+</Workspace>
View
3  CounterView.m
@@ -110,7 +110,8 @@ - (void)drawRect:(NSRect)rect {
[self.ringBackground set];
[outerSlideRingBackground fill];
- [[[[NSShadow alloc] init] autorelease] set];
+ shadow = [[[NSShadow alloc] init] autorelease];
+ [shadow set];
}
CGFloat degreesElapsed;
View
3  SpeakerNotesWindowController.h
@@ -25,8 +25,9 @@
@property(retain) IBOutlet WebView *webView;
@property(retain) IBOutlet SpeakerSlidesView *slidesView;
-@property(readwrite) NSUInteger pageIndex;
+@property(readwrite, setter=setPageIndex:) NSUInteger pageIndex;
- (void)changeFont:(id)sender;
+- (void)setPageIndex:(NSUInteger)pageIndex;
@end
View
3  SpeakerNotesWindowController.m
@@ -76,7 +76,8 @@ - (void)webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)webFrame;
- (void)setPageIndex:(NSUInteger)pageIndex;
{
_pageIndex = pageIndex;
- id ret = [[_webView windowScriptObject] evaluateWebScript:[NSString stringWithFormat:@"displayNotesForSlide(%lu);", pageIndex]];
+ // id ret =
+ [[_webView windowScriptObject] evaluateWebScript:[NSString stringWithFormat:@"displayNotesForSlide(%lu);", pageIndex]];
//NSLog(@"evaluateWebScript returned %@", ret);
}
Something went wrong with that request. Please try again.