Skip to content

Commit

Permalink
Support compilation on 64-bit
Browse files Browse the repository at this point in the history
  • Loading branch information
rpetrich committed Dec 28, 2013
1 parent bef7d19 commit 79c1996
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 17 deletions.
12 changes: 1 addition & 11 deletions ALApplicationList.m
Expand Up @@ -48,10 +48,6 @@ @interface SBIconModel ()
- (SBApplicationIcon *)applicationIconForDisplayIdentifier:(NSString *)displayIdentifier;
@end

@interface UIImage (iOS40)
+ (UIImage *)imageWithCGImage:(CGImageRef)imageRef scale:(CGFloat)scale orientation:(int)orientation;
@end

__attribute__((visibility("hidden")))
@interface ALApplicationListImpl : ALApplicationList
@end
Expand Down Expand Up @@ -115,7 +111,7 @@ - (NSInteger)applicationCount

- (NSString *)description
{
return [NSString stringWithFormat:@"<ALApplicationList: %p applicationCount=%d>", self, self.applicationCount];
return [NSString stringWithFormat:@"<ALApplicationList: %p applicationCount=%ld>", self, (long)self.applicationCount];
}

- (void)didReceiveMemoryWarning
Expand Down Expand Up @@ -241,12 +237,6 @@ - (BOOL)hasCachedIconOfSize:(ALApplicationIconSize)iconSize forDisplayIdentifier

@end

@interface SBIcon ()

- (UIImage *)getIconImage:(NSInteger)sizeIndex;

@end

@implementation ALApplicationListImpl

static void processMessage(SInt32 messageId, mach_port_t replyPort, CFDataRef data)
Expand Down
2 changes: 1 addition & 1 deletion ALApplicationPreferenceViewController.m
Expand Up @@ -420,7 +420,7 @@ - (PSSpecifier *)specifierForIndexPath:(NSIndexPath *)indexPath
}
PSSpecifier *specifier = [specifiers objectAtIndex:0];
if ([specifier respondsToSelector:@selector(setIdentifier:)]) {
[specifier setIdentifier:[NSString stringWithFormat:@"applist:%d,%d", section, indexPath.row]];
[specifier setIdentifier:[NSString stringWithFormat:@"applist:%ld,%ld", (long)section, (long)indexPath.row]];
}
return specifier;
}
Expand Down
10 changes: 6 additions & 4 deletions Makefile
Expand Up @@ -10,7 +10,7 @@ libapplist_OBJC_FILES = ALApplicationList.m ALApplicationTableDataSource.m ALVal
libapplist_CFLAGS = -I./
libapplist_FRAMEWORKS = UIKit CoreGraphics QuartzCore
libapplist_PRIVATE_FRAMEWORKS = AppSupport
libapplist_ARCHS = armv6 armv7
libapplist_ARCHS = armv6 armv7 armv7s arm64

BUNDLE_NAME = AppList
AppList_OBJC_FILES = ALApplicationPreferenceViewController.m
Expand All @@ -20,11 +20,13 @@ AppList_LDFLAGS = -L$(FW_OBJ_DIR)
AppList_LIBRARIES = applist
AppList_INSTALL_PATH = /System/Library/PreferenceBundles

SDKVERSION := 5.1
INCLUDE_SDKVERSION := 6.1
TARGET_IPHONEOS_DEPLOYMENT_VERSION := 3.0

ARCHS = armv6
IPHONE_ARCHS = armv6 armv7 arm64

SDKVERSION_armv6 = 5.1
INCLUDE_SDKVERSION_armv6 = 7.0
THEOS_PLATFORM_SDK_ROOT_armv6 = /Applications/Xcode_Legacy.app/Contents/Developer

include framework/makefiles/common.mk
include framework/makefiles/library.mk
Expand Down
2 changes: 1 addition & 1 deletion framework
Submodule framework updated 57 files
+10 −20 bin/bootstrap.sh
+3 −3 bin/install.copyFile
+3 −3 bin/install.exec
+2 −2 bin/install.mergeDir
+7 −0 bin/lib/Logos/Class.pm
+4 −0 bin/lib/Logos/Generator.pm
+1 −1 bin/lib/Logos/Generator/MobileSubstrate/Class.pm
+2 −2 bin/lib/Logos/Generator/MobileSubstrate/Subclass.pm
+1 −1 bin/lib/Logos/Generator/internal/Class.pm
+2 −2 bin/lib/Logos/Generator/internal/Subclass.pm
+1 −0 bin/lib/Logos/Method.pm
+1 −1 bin/logify.pl
+9 −5 bin/logos.pl
+4 −2 bin/nic.pl
+5 −47 bin/package_version.sh
+1 −1 include
+34 −14 makefiles/common.mk
+10 −0 makefiles/install/deb_local.mk
+10 −0 makefiles/install/deb_remote.mk
+2 −0 makefiles/install/none_local.mk
+1 −0 makefiles/install/none_remote.mk
+1 −1 makefiles/instance/application.mk
+1 −1 makefiles/instance/bundle.mk
+1 −1 makefiles/instance/framework.mk
+1 −1 makefiles/instance/library.mk
+119 −42 makefiles/instance/rules.mk
+1 −1 makefiles/instance/subproject.mk
+1 −1 makefiles/instance/tool.mk
+16 −1 makefiles/instance/tweak.mk
+8 −0 makefiles/legacy.mk
+1 −1 makefiles/master/aggregate.mk
+1 −1 makefiles/master/application.mk
+1 −1 makefiles/master/bundle.mk
+1 −1 makefiles/master/framework.mk
+1 −1 makefiles/master/library.mk
+1 −1 makefiles/master/null.mk
+9 −9 makefiles/master/rules.mk
+1 −1 makefiles/master/subproject.mk
+1 −1 makefiles/master/tool.mk
+4 −2 makefiles/master/tweak.mk
+8 −4 makefiles/messages.mk
+69 −50 makefiles/package.mk
+41 −0 makefiles/package/deb.mk
+5 −0 makefiles/package/none.mk
+8 −0 makefiles/platform/Darwin.mk
+2 −0 makefiles/stage.mk
+4 −1 makefiles/targets/Darwin-arm/iphone.mk
+13 −13 makefiles/targets/Darwin/iphone.mk
+20 −11 makefiles/targets/Darwin/macosx.mk
+8 −9 makefiles/targets/Darwin/simulator.mk
+4 −1 makefiles/targets/Linux/iphone.mk
+4 −4 makefiles/targets/_common/darwin.mk
+3 −3 makefiles/targets/_common/darwin_hierarchial_bundle.mk
+0 −19 makefiles/targets/_common/install_deb_local.mk
+0 −32 makefiles/targets/_common/install_deb_remote.mk
+2 −2 makefiles/targets/_common/linux.mk
+ templates/iphone/tweak.nic.tar

0 comments on commit 79c1996

Please sign in to comment.