Merge branch 'master' of saurik.com:cydia

[cydia.git] / makefile

diff --git a/makefile b/makefile
index 9236ff6f14e1ebae1d745c4996e61238c30728cf..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 := 
@@ -6,7 +12,9 @@ link :=
 #dpkg := /Library/Cydia/bin/dpkg-deb -Zlzma
 dpkg := dpkg-deb
 
-flags += -F/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS$(ios).sdk/System/Library/PrivateFrameworks
+sdk := /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS$(ios).sdk
+
+flags += -F$(sdk)/System/Library/PrivateFrameworks
 flags += -I. -isystem sysroot/usr/include -Lsysroot/usr/lib
 flags += -Wall -Werror -Wno-deprecated-declarations
 flags += -fmessage-length=0
@@ -31,13 +39,18 @@ link += -lpcre
 
 link += -multiply_defined suppress
 
+#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
+
 all: Cydia
 
 clean:
        rm -f Cydia
 
-Cydia: Cydia.mm Reachability.mm UICaboodle/*.mm iPhonePrivate.h
-       cycc -r4.2 -i$(ios) -o$@ -- $(filter %.mm,$^) $(flags) $(link)
+Cydia: Cydia.mm UICaboodle/*.mm iPhonePrivate.h
+       $(cycc) $(filter %.mm,$^) $(flags) $(link)
+       ldid -Slaunch.xml $@
 
 package: Cydia
        sudo rm -rf _