Compile for 2.0 using 3.2 SDK (for now).

diff --git a/iPhonePrivate.h b/iPhonePrivate.h
index fd834c4b442feccf7e95e8d9da226bae99cb6fb1..149fdc865ab15639bcd80a19ccba90ae45d69379 100644 (file)
--- 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
 // #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,
 
 typedef enum {
     UIModalPresentationFullScreen,


@@ -316,7 +317,6 @@ typedef enum {
 } UIModalPresentationStyle;
 
 #define kSCNetworkReachabilityFlagsConnectionOnTraffic kSCNetworkReachabilityFlagsConnectionAutomatic
 } UIModalPresentationStyle;
 
 #define kSCNetworkReachabilityFlagsConnectionOnTraffic kSCNetworkReachabilityFlagsConnectionAutomatic

-#define kSCNetworkReachabilityFlagsConnectionOnDemand (1 << 5)

 
 #define UIBarStyleBlack UIBarStyleBlackOpaque
 
 
 #define UIBarStyleBlack UIBarStyleBlackOpaque
 


@@ -343,6 +343,13 @@ extern float const UIScrollViewDecelerationRateNormal;
 
 #endif//AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER
 // }}}
 
 #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;
 
 // extern *; {{{
 extern CFStringRef const kGSDisplayIdentifiersCapability;

diff --git a/makefile b/makefile
index 70c543298c78e96c96f895057e58bff9051614f8..095831ec04240e46d6b171ca1fe217504834bfc4 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,11 +1,12 @@
 sdks := /Developer/Platforms/iPhoneOS.platform/Developer/SDKs
 
 sdks := /Developer/Platforms/iPhoneOS.platform/Developer/SDKs
 

-ifeq ($(findstring iPhoneOS2.0.sdk,$(wildcard $(sdks)/iPhoneOS*.sdk)),)

 ios := 3.2
 ios := 3.2

-gcc := 4.2
-else
-ios := 2.0
+#ios := 2.0
+
+ifeq ($(patsubst 2%,2,$(ios)),2)

 gcc := 4.0
 gcc := 4.0

+else
+gcc := 4.2

 endif
 
 flags := 
 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 = 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
 
 
 all: MobileCydia