Use a better URL scheme for /ui/ios*/ *and* (frowny) fix a multiple reload issue...

[cydia.git] / makefile

diff --git a/makefile b/makefile
index 70c543298c78e96c96f895057e58bff9051614f8..9a1145dcf42b5ccd2466cf6f8457c7af8af4ba9f 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,18 +1,27 @@
 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 := 
 link := 
 
-#dpkg := /Library/Cydia/bin/dpkg-deb -Zlzma
+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
 
@@ -49,7 +58,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) -mthumb -arch armv6 -o $@ -mcpu=arm1176jzf-s -miphoneos-version-min=2.0 -isysroot $(sdk) -idirafter /usr/include -F/Library/Frameworks
 
 all: MobileCydia
 
@@ -91,6 +100,8 @@ 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
@@ -98,6 +109,6 @@ package: MobileCydia
        mkdir -p debs
        ln -sf debs/cydia_$$(./version.sh)_iphoneos-arm.deb Cydia.deb
        $(dpkg) -b _ Cydia.deb
-       readlink Cydia.deb
+       @echo "$$(stat -L -f "%z" Cydia.deb) $$(stat -f "%Y" Cydia.deb)"
 
 .PHONY: all clean sign