diff options
| author | Sam Bingner <sam@bingner.com> | 2018-10-04 15:06:42 -1000 |
|---|---|---|
| committer | Sam Bingner <sam@bingner.com> | 2018-10-04 15:06:42 -1000 |
| commit | d9d8c1a0f568f255d6274344f50cb5af5759ab4c (patch) | |
| tree | a500c4e8cc002e52d48abda28a053100dc17ec16 | |
| parent | bc025a21e2e1e2efb588144d85f741ab78735c86 (diff) | |
Specify arches to compile via variable and clear up iOS11 availability warningv1.1.32%b2
| -rw-r--r-- | CyteKit/ViewController.mm | 4 | ||||
| -rw-r--r-- | CyteKit/WebViewController.mm | 3 | ||||
| -rw-r--r-- | iPhonePrivate.h | 1 | ||||
| -rw-r--r-- | makefile | 12 |
4 files changed, 14 insertions, 6 deletions
diff --git a/CyteKit/ViewController.mm b/CyteKit/ViewController.mm index 2e5d5a1..7f2a53f 100644 --- a/CyteKit/ViewController.mm +++ b/CyteKit/ViewController.mm @@ -84,8 +84,10 @@ // Load on first appearance. We don't need to set the loaded flag here // because it is set for us the first time -reloadData is called. - if (kCFCoreFoundationVersionNumber >= 1443.00) +#ifdef __arm64__ + if (@available(iOS 11, *)) self.navigationController.navigationBar.prefersLargeTitles = YES; +#endif if (![self hasLoaded]) [self reloadData]; } diff --git a/CyteKit/WebViewController.mm b/CyteKit/WebViewController.mm index 329d568..0394834 100644 --- a/CyteKit/WebViewController.mm +++ b/CyteKit/WebViewController.mm @@ -213,7 +213,8 @@ static _H<NSMutableSet> Diversions_; + (void) _initialize { [WebPreferences _setInitialDefaultTextEncodingToSystemEncoding]; - [WebPreferences setWebKitLinkTimeVersion:PACKED_VERSION(3453,0,0)]; + if ([WebPreferences respondsToSelector:@selector(setWebKitLinkTimeVersion:)]) + [WebPreferences setWebKitLinkTimeVersion:PACKED_VERSION(3453,0,0)]; void *js(NULL); if (js == NULL) diff --git a/iPhonePrivate.h b/iPhonePrivate.h index e8748a4..9852bbe 100644 --- a/iPhonePrivate.h +++ b/iPhonePrivate.h @@ -281,6 +281,7 @@ enum { // }}} // @interface Web* {{{ @interface WebPreferences : NSObject ++ (void) setWebKitLinkTimeVersion:(NSInteger)version; - (void) setCacheModel:(WebCacheModel)value; - (void) setJavaScriptCanOpenWindowsAutomatically:(BOOL)value; @end @@ -16,9 +16,12 @@ sdk := $(shell xcodebuild -sdk iphoneos -version Path) cycc += -idirafter /usr/include cycc += -F$(sdk)/System/Library/PrivateFrameworks -cycc += -arch armv6 +ARCHS := armv6 arm64 +cycc += $(foreach arch,$(ARCHS),-arch $(arch)) + +ifeq ("$(findstring armv6,$(ARCHS))","armv6") cycc += -Xarch_armv6 -miphoneos-version-min=5.0 -cycc += -arch arm64 +endif cycc += -Xarch_arm64 -miphoneos-version-min=7.0 cycc += -fmessage-length=0 @@ -71,8 +74,6 @@ libs += -licucore uikit := uikit += -framework UIKit -link += -Xarch_armv6 -Wl,-segalign,4000 - dirs := Menes CyteKit Cydia SDURLCache code := $(foreach dir,$(dirs),$(wildcard $(foreach ext,h hpp c cpp m mm,$(dir)/*.$(ext)))) @@ -109,10 +110,13 @@ aptc += -Wno-deprecated-register aptc += -Wno-unused-private-field aptc += -Wno-unused-variable +ifeq ($(findstring armv6,$(ARCHS)),"armv6") flag += -Xarch_armv6 -marm # @synchronized flag += -Xarch_armv6 -mcpu=arm1176jzf-s flag += -Xarch_armv6 -ffixed-r9 link += -Xarch_armv6 -Wl,-lgcc_s.1 +link += -Xarch_armv6 -Wl,-segalign,4000 +endif plus += -std=c++11 plus += -stdlib=libc++ |