Standardize [super reloadData] placement.

[cydia.git] / makefile

diff --git a/makefile b/makefile
index 5fbff179384a49a54c33b66f3e472d5948b58fad..eae4fd3ad75c3e5324dfe71f981d6fee89cc58d6 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,13 +1,8 @@
 sdks := /Developer/Platforms/iPhoneOS.platform/Developer/SDKs
+ioss := $(sort $(patsubst $(sdks)/iPhoneOS%.sdk,%,$(wildcard $(sdks)/iPhoneOS*.sdk)))
 
-ios := 3.2
-#ios := 2.0
-
-ifeq ($(patsubst 2%,2,$(ios)),2)
-gcc := 4.0
-else
+ios := $(word $(words $(ioss)),$(ioss))
 gcc := 4.2
-endif
 
 flags := 
 link := 
@@ -56,6 +51,8 @@ uikit += -framework UIKit
 backrow := 
 backrow += -FAppleTV -framework BackRow -framework AppleTV
 
+version := $(shell ./version.sh)
+
 #cycc = cycc -r4.2 -i$(ios) -o$@
 gxx := /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/g++-$(gcc)
 cycc = $(gxx) -mthumb -arch armv6 -o $@ -mcpu=arm1176jzf-s -miphoneos-version-min=2.0 -isysroot $(sdk) -idirafter /usr/include -F/Library/Frameworks
@@ -68,8 +65,13 @@ clean:
 %.o: %.c
        $(cycc) -c -o $@ -x c $<
 
-MobileCydia: MobileCydia.mm UICaboodle/*.h UICaboodle/*.mm SDURLCache/SDURLCache.h SDURLCache/SDURLCache.m iPhonePrivate.h lookup3.o Cytore.hpp
-       $(cycc) $(filter %.mm,$^) $(filter %.o,$^) $(foreach m,$(filter %.m,$^),-x objective-c++ $(m)) $(flags) $(link) $(uikit)
+sysroot:
+       @echo "Please read compiling.txt: you do not have a ./sysroot/ folder with the on-device requirements." 1>&2
+       @echo 1>&2
+       @exit 1
+
+MobileCydia: sysroot MobileCydia.mm UICaboodle/*.h UICaboodle/*.mm SDURLCache/SDURLCache.h SDURLCache/SDURLCache.m iPhonePrivate.h lookup3.o Cytore.hpp
+       $(cycc) $(filter %.mm,$^) $(filter %.o,$^) $(foreach m,$(filter %.m,$^),-x objective-c++ $(m)) $(flags) $(link) $(uikit) -DCYDIA_VERSION='"$(version)"'
        ldid -Slaunch.xml $@ || { rm -f $@ && false; }
 
 CydiaAppliance: CydiaAppliance.mm
@@ -100,12 +102,14 @@ package: MobileCydia
        mkdir -p _/DEBIAN
        ./control.sh _ >_/DEBIAN/control
        
+       find _ -name '*.png' -exec ./pngcrush.sh '{}' ';'
+       
        sudo chown -R 0 _
        sudo chgrp -R 0 _
        sudo chmod 6755 _/Applications/Cydia.app/MobileCydia
        
        mkdir -p debs
-       ln -sf debs/cydia_$$(./version.sh)_iphoneos-arm.deb Cydia.deb
+       ln -sf debs/cydia_$(version)_iphoneos-arm.deb Cydia.deb
        $(dpkg) -b _ Cydia.deb
        @echo "$$(stat -L -f "%z" Cydia.deb) $$(stat -f "%Y" Cydia.deb)"