X-Git-Url: https://git.saurik.com/cydia.git/blobdiff_plain/71cc7be109c603c3dcd7e08fbe440707c4f652de..f333f6c59d8af7624e10301b13ce631a4bd843a0:/makefile

diff --git a/makefile b/makefile
index 168a74f0..9a1145dc 100644
--- a/makefile
+++ b/makefile
@@ -1,18 +1,29 @@
-ifeq (o,O)
-ios := 2.0
+sdks := /Developer/Platforms/iPhoneOS.platform/Developer/SDKs
+
+ios := 3.2
+#ios := 2.0
+
+ifeq ($(patsubst 2%,2,$(ios)),2)
 gcc := 4.0
 else
-ios := 3.2
 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 := /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS$(ios).sdk
+sdk := $(sdks)/iPhoneOS$(ios).sdk
 
 flags += -F$(sdk)/System/Library/PrivateFrameworks
 flags += -I. -isystem sysroot/usr/include -Lsysroot/usr/lib
@@ -28,6 +39,7 @@ link += -framework GraphicsServices
 link += -framework IOKit
 link += -framework JavaScriptCore
 link += -framework QuartzCore
+link += -framework SpringBoardServices
 link += -framework SystemConfiguration
 link += -framework WebCore
 link += -framework WebKit
@@ -46,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
 
@@ -88,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
@@ -95,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