summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJay Freeman (saurik) <saurik@saurik.com>2010-12-03 01:36:27 -0800
committerJay Freeman (saurik) <saurik@saurik.com>2010-12-03 01:36:27 -0800
commit670fdb01e05ad4ebde4d5f71f2756526dddc2f11 (patch)
treeb3426456cac54b4d9c03ff48a587af23893cb6af
parentbb0fe3c941d750de3587298bee36d07ff92debda (diff)
Compile for 2.0 using 3.2 SDK (for now).
-rw-r--r--iPhonePrivate.h9
-rw-r--r--makefile11
2 files changed, 14 insertions, 6 deletions
diff --git a/iPhonePrivate.h b/iPhonePrivate.h
index fd834c4..149fdc8 100644
--- a/iPhonePrivate.h
+++ b/iPhonePrivate.h
@@ -307,6 +307,7 @@ typedef enum {
// #ifndef AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER {{{
#ifndef AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER
#define AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER
+// XXX: this is a random jumble of garbage
typedef enum {
UIModalPresentationFullScreen,
@@ -316,7 +317,6 @@ typedef enum {
} UIModalPresentationStyle;
#define kSCNetworkReachabilityFlagsConnectionOnTraffic kSCNetworkReachabilityFlagsConnectionAutomatic
-#define kSCNetworkReachabilityFlagsConnectionOnDemand (1 << 5)
#define UIBarStyleBlack UIBarStyleBlackOpaque
@@ -343,6 +343,13 @@ extern float const UIScrollViewDecelerationRateNormal;
#endif//AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER
// }}}
+// #if __IPHONE_OS_VERSION_MIN_REQUIRED < 30000 {{{
+#if __IPHONE_OS_VERSION_MIN_REQUIRED < 30000
+
+#define kSCNetworkReachabilityFlagsConnectionOnDemand (1 << 5)
+
+#endif
+// }}}
// extern *; {{{
extern CFStringRef const kGSDisplayIdentifiersCapability;
diff --git a/makefile b/makefile
index 70c5432..095831e 100644
--- a/makefile
+++ b/makefile
@@ -1,11 +1,12 @@
sdks := /Developer/Platforms/iPhoneOS.platform/Developer/SDKs
-ifeq ($(findstring iPhoneOS2.0.sdk,$(wildcard $(sdks)/iPhoneOS*.sdk)),)
ios := 3.2
-gcc := 4.2
-else
-ios := 2.0
+#ios := 2.0
+
+ifeq ($(patsubst 2%,2,$(ios)),2)
gcc := 4.0
+else
+gcc := 4.2
endif
flags :=
@@ -49,7 +50,7 @@ backrow += -FAppleTV -framework BackRow -framework AppleTV
#cycc = cycc -r4.2 -i$(ios) -o$@
gxx := /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/g++-$(gcc)
-cycc = $(gxx) -arch armv6 -o $@ -mcpu=arm1176jzf-s -miphoneos-version-min=$(ios) -isysroot $(sdk) -idirafter /usr/include -F/Library/Frameworks
+cycc = $(gxx) -arch armv6 -o $@ -mcpu=arm1176jzf-s -miphoneos-version-min=2.0 -isysroot $(sdk) -idirafter /usr/include -F/Library/Frameworks
all: MobileCydia