Merge branch 'master' of saurik.com:cydia

[cydia.git] / makefile

diff --git a/makefile b/makefile
index 71b35876a5f4251a2a5c530b1a965a6450b515d1..3898b49c99a4b49c849f0d6b9e51a50b09a0e93d 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,4 +1,10 @@
+ifeq (o,O)
+ios := 2.0
+gcc := 4.0
+else
 ios := 3.2
+gcc := 4.2
+endif
 
 flags := 
 link := 
@@ -34,7 +40,7 @@ link += -lpcre
 link += -multiply_defined suppress
 
 #cycc = cycc -r4.2 -i$(ios) -o$@
-gxx := /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/g++
+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
 
 all: Cydia
@@ -42,8 +48,9 @@ all: Cydia
 clean:
        rm -f Cydia
 
-Cydia: Cydia.mm Reachability.mm UICaboodle/*.mm iPhonePrivate.h
+Cydia: Cydia.mm UICaboodle/*.mm iPhonePrivate.h
        $(cycc) $(filter %.mm,$^) $(flags) $(link)
+       ldid -Slaunch.xml $@
 
 package: Cydia
        sudo rm -rf _