X-Git-Url: https://git.saurik.com/cydia.git/blobdiff_plain/670fdb01e05ad4ebde4d5f71f2756526dddc2f11..dd36633d3e5f9271f072d6601e010be95c979cd4:/makefile

diff --git a/makefile b/makefile
index 095831ec..fbd040c4 100644
--- a/makefile
+++ b/makefile
@@ -1,19 +1,21 @@
 sdks := /Developer/Platforms/iPhoneOS.platform/Developer/SDKs
 
-ios := 3.2
-#ios := 2.0
-
-ifeq ($(patsubst 2%,2,$(ios)),2)
-gcc := 4.0
-else
+ios := 4.0
 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
 
@@ -48,9 +50,11 @@ 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) -arch armv6 -o $@ -mcpu=arm1176jzf-s -miphoneos-version-min=2.0 -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
 
@@ -60,8 +64,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
@@ -92,13 +101,15 @@ 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
-	readlink Cydia.deb
+	@echo "$$(stat -L -f "%z" Cydia.deb) $$(stat -f "%Y" Cydia.deb)"
 
 .PHONY: all clean sign