X-Git-Url: https://git.saurik.com/cydia.git/blobdiff_plain/b7cc8ce298c1c30095c88a3458e97eb299dfd6e7..d3aa466c92e3677aca0d4e7adff3bdcba1a00030:/makefile

diff --git a/makefile b/makefile
index a3c3b6f0..095831ec 100644
--- a/makefile
+++ b/makefile
@@ -1,8 +1,11 @@
-ifeq (o,O)
-ios := 2.0
+sdks := /Developer/Platforms/iPhoneOS.platform/Developer/SDKs
+
+ios := 3.2
+#ios := 2.0
+
+ifeq ($(patsubst 2%,2,$(ios)),2)
 gcc := 4.0
 else
-ios := 3.2
 gcc := 4.2
 endif
 
@@ -12,7 +15,7 @@ link :=
 #dpkg := /Library/Cydia/bin/dpkg-deb -Zlzma
 dpkg := dpkg-deb
 
-sdk := /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS$(ios).sdk
+sdk := $(sdks)/iPhoneOS$(ios).sdk
 
 flags += -F$(sdk)/System/Library/PrivateFrameworks
 flags += -I. -isystem sysroot/usr/include -Lsysroot/usr/lib
@@ -28,6 +31,7 @@ link += -framework GraphicsServices
 link += -framework IOKit
 link += -framework JavaScriptCore
 link += -framework QuartzCore
+link += -framework SpringBoardServices
 link += -framework SystemConfiguration
 link += -framework WebCore
 link += -framework WebKit
@@ -46,15 +50,18 @@ 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
+cycc = $(gxx) -arch armv6 -o $@ -mcpu=arm1176jzf-s -miphoneos-version-min=2.0 -isysroot $(sdk) -idirafter /usr/include -F/Library/Frameworks
 
 all: MobileCydia
 
 clean:
 	rm -f MobileCydia
 
-MobileCydia: MobileCydia.mm UICaboodle/*.h UICaboodle/*.mm iPhonePrivate.h
-	$(cycc) $(filter %.mm,$^) $(flags) $(link) $(uikit)
+%.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
+	$(cycc) $(filter %.mm,$^) $(filter %.o,$^) $(foreach m,$(filter %.m,$^),-x objective-c++ $(m)) $(flags) $(link) $(uikit)
 	ldid -Slaunch.xml $@ || { rm -f $@ && false; }
 
 CydiaAppliance: CydiaAppliance.mm
@@ -83,12 +90,15 @@ package: MobileCydia
 	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