X-Git-Url: https://git.saurik.com/cydia.git/blobdiff_plain/1e4922b8442669a0f94a6602a49d950233555fff..4c3cf6af69f13897641cc8df4c1194e7e19ec26f:/makefile

diff --git a/makefile b/makefile
index ddb9024a..1d189f0a 100644
--- a/makefile
+++ b/makefile
@@ -6,7 +6,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,22 +33,26 @@ link += -lpcre
 
 link += -multiply_defined suppress
 
+#cycc = cycc -r4.2 -i$(ios) -o$@
+gxx := /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/g++
+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
-	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
-	rm -rf _
+	sudo rm -rf _
 	mkdir -p _/var/lib/cydia
 	
 	mkdir -p _/usr/libexec
 	cp -a Library _/usr/libexec/cydia
-	# XXX: fix du
-	#cp -a /apl/tel/dest/iphoneos-arm/coreutils/usr/bin/du _/usr/libexec/cydia
+	cp -a sysroot/usr/bin/du _/usr/libexec/cydia
 	
 	mkdir -p _/System/Library
 	cp -a LaunchDaemons _/System/Library/LaunchDaemons
@@ -54,7 +60,6 @@ package: Cydia
 	mkdir -p _/Applications
 	cp -a Cydia.app _/Applications/Cydia.app
 	cp -a Cydia _/Applications/Cydia.app/Cydia_
-	chmod 6755 _/Applications/Cydia.app/Cydia_
 	
 	mkdir -p _/System/Library/PreferenceBundles
 	cp -a CydiaSettings.bundle _/System/Library/PreferenceBundles/CydiaSettings.bundle
@@ -62,6 +67,10 @@ package: Cydia
 	mkdir -p _/DEBIAN
 	echo "$$(cat control)"$$'\nInstalled-Size: '"$$(du -s _ | cut -f 1)" > _/DEBIAN/control
 	
+	sudo chown -R 0 _
+	sudo chgrp -R 0 _
+	sudo chmod 6755 _/Applications/Cydia.app/Cydia_
+	
 	$(dpkg) -b _ $(shell grep ^Package: control | cut -d ' ' -f 2-)_$(shell grep ^Version: control | cut -d ' ' -f 2)_iphoneos-arm.deb
 
 .PHONY: all clean sign