Remove alternative sysroot-2.tgz as sysroot.sh is no longer egregious.

[cydia.git] / makefile

diff --git a/makefile b/makefile
index 3c6cda482cee7bf34e7a3e4f81658aa37976649e..2a227cc61100935be6a01597a7a8c8f2d6ac6c80 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,13 +1,7 @@
 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 := 
@@ -58,7 +52,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=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
 
@@ -68,7 +62,10 @@ 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
+Version.h:
+       ./Version.h.sh
+
+MobileCydia: Version.h 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)
        ldid -Slaunch.xml $@ || { rm -f $@ && false; }
 
@@ -100,6 +97,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