diff options
| -rw-r--r-- | MobileCydia.mm | 5 | ||||
| -rw-r--r-- | iPhonePrivate.h | 15 | ||||
| -rw-r--r-- | makefile | 51 | ||||
| -rwxr-xr-x | sysroot.sh | 1 |
4 files changed, 17 insertions, 55 deletions
diff --git a/MobileCydia.mm b/MobileCydia.mm index 555cb0a..79163ba 100644 --- a/MobileCydia.mm +++ b/MobileCydia.mm @@ -38,7 +38,6 @@ #include <CoreFoundation/CFInternal.h> #endif -#include <CoreFoundation/CFPriv.h> #include <CoreFoundation/CFUniChar.h> #include <SystemConfiguration/SystemConfiguration.h> @@ -5024,7 +5023,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { reason = @"virtual"; } - NSDictionary *version(start.TargetVer() == 0 ? [NSNull null] : [NSDictionary dictionaryWithObjectsAndKeys: + NSDictionary *version(start.TargetVer() == 0 ? (NSDictionary *) [NSNull null] : [NSDictionary dictionaryWithObjectsAndKeys: [NSString stringWithUTF8String:start.CompType()], @"operator", [NSString stringWithUTF8String:start.TargetVer()], @"value", nil]); @@ -5893,7 +5892,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { section_ = [section localized]; name_ = section_ == nil || [section_ length] == 0 ? UCLocalize("NO_SECTION") : (NSString *) section_; - count_ = [NSString stringWithFormat:@"%d", [section count]]; + count_ = [NSString stringWithFormat:@"%zd", [section count]]; if (editing_) [switch_ setOn:(isSectionVisible(basic_) ? 1 : 0) animated:NO]; diff --git a/iPhonePrivate.h b/iPhonePrivate.h index e9806d8..d085dd9 100644 --- a/iPhonePrivate.h +++ b/iPhonePrivate.h @@ -234,6 +234,10 @@ static const UIActivityIndicatorViewStyle UIActivityIndicatorViewStyleWhiteTiny( - (void) addTarget:(id)target action:(SEL)action forEvents:(NSInteger)events; @end +@interface UIDevice (Apple) +- (NSString *) uniqueIdentifier; +@end + @interface UIImage (Apple) + (UIImage *) applicationImageNamed:(NSString *)name; + (UIImage *) imageAtPath:(NSString *)path; @@ -408,17 +412,6 @@ extern float const UIScrollViewDecelerationRateNormal; - (WebFrame *) contentFrame; @end -typedef enum { - UIInterfaceOrientationMaskPortrait = (1 << UIInterfaceOrientationPortrait), - UIInterfaceOrientationMaskLandscapeLeft = (1 << UIInterfaceOrientationLandscapeLeft), - UIInterfaceOrientationMaskLandscapeRight = (1 << UIInterfaceOrientationLandscapeRight), - UIInterfaceOrientationMaskPortraitUpsideDown = (1 << UIInterfaceOrientationPortraitUpsideDown), - UIInterfaceOrientationMaskLandscape = (UIInterfaceOrientationMaskLandscapeLeft | UIInterfaceOrientationMaskLandscapeRight), - UIInterfaceOrientationMaskAll = (UIInterfaceOrientationMaskPortrait | UIInterfaceOrientationMaskLandscapeLeft | - UIInterfaceOrientationMaskLandscapeRight | UIInterfaceOrientationMaskPortraitUpsideDown), - UIInterfaceOrientationMaskAllButUpsideDown = (UIInterfaceOrientationMaskPortrait | UIInterfaceOrientationMaskLandscapeLeft | UIInterfaceOrientationMaskLandscapeRight), -} UIInterfaceOrientationMask; - // extern *; {{{ extern CFStringRef const kGSDisplayIdentifiersCapability; extern float const UIWebViewGrowsAndShrinksToFitHeight; @@ -1,36 +1,11 @@ -dev := $(shell xcode-select --print-path)/Platforms/iPhoneOS.platform/Developer -sdks := $(dev)/SDKs -ioss := $(sort $(patsubst $(sdks)/iPhoneOS%.sdk,%,$(wildcard $(sdks)/iPhoneOS*.sdk))) -ios := $(word $(words $(ioss)),$(ioss)) - -# XXX: as of iOS 6.x armv6 is not supported :( -ios := 5.1 - -# if you can tolerate clang, set this to blank -gcc := 4.2 - -ifeq ($(gcc),) -gxx := $(dev)/usr/bin/clang++ -else -gxx := $(dev)/usr/bin/g++ -endif +gxx := $(shell xcrun --sdk iphoneos -f g++) +sdk := $(shell xcodebuild -sdk iphoneos -version Path) flags := link := libs := -ifeq (o,O) # gzip is actually better -dpkg := /Library/Cydia/bin/dpkg-deb -ifeq ($(wildcard $(dpkg)),$(dpkg)) -dpkg := $(dpkg) -zlzma -else -dpkg := dpkg-deb -zbzip2 -endif -else -dpkg := dpkg-deb -endif - -sdk := $(sdks)/iPhoneOS$(ios).sdk +dpkg := dpkg-deb -Zlzma flags += -F$(sdk)/System/Library/PrivateFrameworks flags += -I. -isystem sysroot/usr/include @@ -40,14 +15,10 @@ flags += -fvisibility=hidden flags += -Wall -ifeq ($(gcc),) flags += -Wno-unknown-warning-option flags += -Wno-logical-op-parentheses -else -flags += -fobjc-exceptions -flags += -fno-guess-branch-probability -endif - +flags += -Wno-dangling-else +flags += -Wno-shift-op-parentheses flags += -Wno-deprecated-declarations xflags := @@ -80,12 +51,12 @@ backrow += -FAppleTV -framework BackRow -framework AppleTV version := $(shell ./version.sh) -cycc = $(gxx) -mthumb -arch armv6 -o $@ -miphoneos-version-min=2.0 -isysroot $(sdk) -idirafter /usr/include -F{sysroot,}/Library/Frameworks -#cycc = cycc -r4.2 -i$(ios) -o$@ +cycc = $(gxx) -arch armv6 -o $@ -miphoneos-version-min=2.0 -isysroot $(sdk) -idirafter /usr/include -F{sysroot,}/Library/Frameworks -ifneq ($(gcc),) -cycc += -Xarch_armv6 -mcpu=arm1176jzf-s -endif +cycc += -marm # @synchronized +cycc += -mcpu=arm1176jzf-s +cycc += -mllvm -arm-reserve-r9 +link += -lgcc_s.1 dirs := Menes CyteKit Cydia SDURLCache @@ -158,7 +129,7 @@ CydiaAppliance: CydiaAppliance.mm $(cycc) $(filter %.mm,$^) $(flags) $(link) -bundle $(libs) $(backrow) cfversion: cfversion.mm - $(cycc) $(filter %.mm,$^) $(flags) -framework CoreFoundation + $(cycc) $(filter %.mm,$^) $(flags) $(link) -framework CoreFoundation @ldid -T0 -S $@ postinst: postinst.mm Sources.mm Sources.h CyteKit/stringWithUTF8Bytes.mm CyteKit/stringWithUTF8Bytes.h CyteKit/UCPlatform.h @@ -111,7 +111,6 @@ cd usr/include mkdir CoreFoundation wget -O CoreFoundation/CFBundlePriv.h "http://www.opensource.apple.com/source/CF/CF-550/CFBundlePriv.h?txt" -wget -O CoreFoundation/CFPriv.h "http://www.opensource.apple.com/source/CF/CF-550/CFPriv.h?txt" wget -O CoreFoundation/CFUniChar.h "http://www.opensource.apple.com/source/CF/CF-550/CFUniChar.h?txt" if true; then |