X-Git-Url: https://git.saurik.com/cydia.git/blobdiff_plain/c21004b921c67b3e7748cc1f0c53d02deec1ebca..3adcfba70e98d8248f36c69c9c54fa6c11c8683a:/makefile?ds=sidebyside

diff --git a/makefile b/makefile
index ddb9024a..5868accc 100644
--- 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
@@ -21,7 +29,6 @@ link += -framework IOKit
 link += -framework JavaScriptCore
 link += -framework QuartzCore
 link += -framework SystemConfiguration
-link += -framework UIKit
 link += -framework WebCore
 link += -framework WebKit
 
@@ -31,37 +38,63 @@ link += -lpcre
 
 link += -multiply_defined suppress
 
-all: Cydia
+uikit := 
+uikit += -framework UIKit
+
+backrow := 
+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=$(ios) -isysroot $(sdk) -idirafter /usr/include -F/Library/Frameworks
+
+all: MobileCydia
 
 clean:
-	rm -f Cydia
+	rm -f MobileCydia
 
-Cydia: Cydia.mm Reachability.mm UICaboodle/*.mm
-	cycc -r4.2 -i$(ios) -o$@ -- $(filter %.mm,$^) $(flags) $(link)
+%.o: %.c
+	$(cycc) -c -o $@ -x c $<
 
-package: Cydia
-	rm -rf _
+MobileCydia: MobileCydia.mm UICaboodle/*.h UICaboodle/*.mm iPhonePrivate.h lookup3.o
+	$(cycc) $(filter %.mm,$^) $(filter %.o,$^) $(flags) $(link) $(uikit)
+	ldid -Slaunch.xml $@ || { rm -f $@ && false; }
+
+CydiaAppliance: CydiaAppliance.mm
+	$(cycc) $(filter %.mm,$^) $(flags) -bundle $(link) $(backrow)
+
+package: MobileCydia
+	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
 	
 	mkdir -p _/Applications
-	cp -a Cydia.app _/Applications/Cydia.app
-	cp -a Cydia _/Applications/Cydia.app/Cydia_
-	chmod 6755 _/Applications/Cydia.app/Cydia_
+	cp -a MobileCydia.app _/Applications/Cydia.app
+	cp -a MobileCydia _/Applications/Cydia.app/MobileCydia
+	
+	#mkdir -p _/Applications/Lowtide.app/Appliances
+	#cp -a Cydia.frappliance _/Applications/Lowtide.app/Appliances
+	#cp -a CydiaAppliance _/Applications/Lowtide.app/Appliances/Cydia.frappliance
 	
 	mkdir -p _/System/Library/PreferenceBundles
 	cp -a CydiaSettings.bundle _/System/Library/PreferenceBundles/CydiaSettings.bundle
 	
 	mkdir -p _/DEBIAN
-	echo "$$(cat control)"$$'\nInstalled-Size: '"$$(du -s _ | cut -f 1)" > _/DEBIAN/control
+	./control.sh _ >_/DEBIAN/control
+	
+	sudo chown -R 0 _
+	sudo chgrp -R 0 _
+	sudo chmod 6755 _/Applications/Cydia.app/MobileCydia
 	
-	$(dpkg) -b _ $(shell grep ^Package: control | cut -d ' ' -f 2-)_$(shell grep ^Version: control | cut -d ' ' -f 2)_iphoneos-arm.deb
+	mkdir -p debs
+	ln -sf debs/cydia_$$(./version.sh)_iphoneos-arm.deb Cydia.deb
+	$(dpkg) -b _ Cydia.deb
+	readlink Cydia.deb
 
 .PHONY: all clean sign