Skip to content

Commit

Permalink
Update project for Xcode 12 (!)
Browse files Browse the repository at this point in the history
  • Loading branch information
@simonwhitaker
simonwhitaker committed Jan 31, 2021
1 parent 2a3e178 commit 26df638
Show file tree
Hide file tree
Showing 8 changed files with 424 additions and 2,144 deletions.
349 changes: 349 additions & 0 deletions Base.lproj/MainMenu.xib
View file

Large diffs are not rendered by default.

2,125 changes: 0 additions & 2,125 deletions English.lproj/MainMenu.xib
View file

This file was deleted.

4 changes: 2 additions & 2 deletions Grid.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ enum draghandle {

@protocol GridDelegate <NSObject>

-(void)controlPointWasDraggedAtIndex:(unsigned int)index;
-(void)controlPointWasDraggedAtIndex:(NSUInteger)index;

@end
@end
72 changes: 64 additions & 8 deletions Tween-o-Matic.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,8 @@
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
13E42FB307B3F0F600E4EEF1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
1DDD58150DA1D0A300B32029 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = "<group>"; };
256AC3D80F4B6AC300CF3369 /* Tween_o_MaticAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Tween_o_MaticAppDelegate.h; sourceTree = "<group>"; };
256AC3D90F4B6AC300CF3369 /* Tween_o_MaticAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Tween_o_MaticAppDelegate.m; sourceTree = "<group>"; };
256AC3F00F4B6AF500CF3369 /* Tween_o_Matic_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Tween_o_Matic_Prefix.pch; sourceTree = "<group>"; };
Expand All @@ -38,6 +36,8 @@
F4394A1311608A1F00930F4D /* lorry.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = lorry.png; sourceTree = "<group>"; };
F450D34B115D4B8E0033A32E /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
F457AE75116130FC00CB5E72 /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = "<group>"; };
F46B954325C6B50B00D0B14C /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
F46B954525C6B50F00D0B14C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
F4795C56115BFBCD008CB8CC /* Grid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Grid.h; sourceTree = "<group>"; };
F4795C57115BFBCD008CB8CC /* Grid.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Grid.m; sourceTree = "<group>"; };
F4EC1592115FC6BA00300DCB /* UNLICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = UNLICENSE; sourceTree = "<group>"; };
Expand Down Expand Up @@ -166,14 +166,15 @@
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0410;
LastUpgradeCheck = 1240;
};
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "Tween-o-Matic" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 1;
knownRegions = (
en,
Base,
);
mainGroup = 29B97314FDCFA39411CA2CEA /* Tween-o-Matic */;
projectDirPath = "";
Expand Down Expand Up @@ -217,15 +218,15 @@
089C165CFE840E0CC02AAC07 /* InfoPlist.strings */ = {
isa = PBXVariantGroup;
children = (
089C165DFE840E0CC02AAC07 /* English */,
F46B954325C6B50B00D0B14C /* en */,
);
name = InfoPlist.strings;
sourceTree = "<group>";
};
1DDD58140DA1D0A300B32029 /* MainMenu.xib */ = {
isa = PBXVariantGroup;
children = (
1DDD58150DA1D0A300B32029 /* English */,
F46B954525C6B50F00D0B14C /* Base */,
);
name = MainMenu.xib;
sourceTree = "<group>";
Expand All @@ -237,6 +238,8 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_IDENTITY = "-";
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_MODEL_TUNING = G5;
Expand All @@ -245,6 +248,7 @@
GCC_PREFIX_HEADER = Tween_o_Matic_Prefix.pch;
INFOPLIST_FILE = "Tween_o_Matic-Info.plist";
INSTALL_PATH = "$(HOME)/Applications";
PRODUCT_BUNDLE_IDENTIFIER = "com.yourcompany.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "Tween-o-Matic";
};
name = Debug;
Expand All @@ -253,23 +257,51 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_IDENTITY = "-";
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = Tween_o_Matic_Prefix.pch;
INFOPLIST_FILE = "Tween_o_Matic-Info.plist";
INSTALL_PATH = "$(HOME)/Applications";
PRODUCT_BUNDLE_IDENTIFIER = "com.yourcompany.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = "Tween-o-Matic";
};
name = Release;
};
C01FCF4F08A954540054247B /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = "";
Expand All @@ -279,9 +311,33 @@
C01FCF5008A954540054247B /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
SDKROOT = "";
};
Expand Down
10 changes: 5 additions & 5 deletions Tween_o_Matic-Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@
<key>CFBundleIconFile</key>
<string></string>
<key>CFBundleIdentifier</key>
<string>com.yourcompany.${PRODUCT_NAME:rfc1034identifier}</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>LSMinimumSystemVersion</key>
<string>${MACOSX_DEPLOYMENT_TARGET}</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>LSMinimumSystemVersion</key>
<string>${MACOSX_DEPLOYMENT_TARGET}</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
Expand Down
2 changes: 1 addition & 1 deletion Tween_o_MaticAppDelegate.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
-(IBAction)updateControlPoints:(id)sender;
-(IBAction)doAnimationDemo:(id)sender;

-(void)updateControlPointFromGridAtIndex:(unsigned int)index;
-(void)updateControlPointFromGridAtIndex:(NSUInteger)index;

@property (nonatomic, retain) IBOutlet Grid* grid;
@property (nonatomic, retain) IBOutlet NSWindow *window;
Expand Down
6 changes: 3 additions & 3 deletions Tween_o_MaticAppDelegate.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ -(void)windowDidResize:(NSNotification*)notification {
}

-(IBAction)updateTimingFunction:(id)sender {
int curveTypeIndex = [self.curveTypeDropDown indexOfSelectedItem];
NSInteger curveTypeIndex = [self.curveTypeDropDown indexOfSelectedItem];
if (curveTypeIndex <= 4) {
TimingFunction* tf = (TimingFunction*)[self.curveTypes objectAtIndex:curveTypeIndex];

Expand Down Expand Up @@ -151,13 +151,13 @@ -(IBAction)updateControlPoints:(id)sender {
[self updateTimingFunction:nil];
}

-(void)controlPointWasDraggedAtIndex:(unsigned int)index {
-(void)controlPointWasDraggedAtIndex:(NSUInteger)index {
[self.curveTypeDropDown selectItemAtIndex:5]; // set drop-down to "custom"
[self updateControlPointFromGridAtIndex:index];
[self updateTimingFunction:nil];
}

-(void)updateControlPointFromGridAtIndex:(unsigned int)index {
-(void)updateControlPointFromGridAtIndex:(NSUInteger)index {
if (index == CP_1) {
[self.cp1X setFloatValue:self.grid.cp1.x];
[self.cp1Y setFloatValue:self.grid.cp1.y];
Expand Down
0 English.lproj/InfoPlist.strings → en.lproj/InfoPlist.strings
View file
File renamed without changes.

0 comments on commit 26df638

Please sign in to comment.