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

diff --git a/makefile b/makefile
index 6407cd5a..ddb9024a 100644
--- a/makefile
+++ b/makefile
@@ -1,42 +1,67 @@
-ifndef PKG_TARG
-target :=
-else
-target := $(PKG_TARG)-
-endif
+ios := 3.2
+
+flags := 
+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
+flags += -I. -isystem sysroot/usr/include -Lsysroot/usr/lib
+flags += -Wall -Werror -Wno-deprecated-declarations
+flags += -fmessage-length=0
+flags += -g0 -O2
+flags += -fobjc-call-cxx-cdtors -fobjc-exceptions
+
+link += -framework CoreFoundation
+link += -framework CoreGraphics
+link += -framework Foundation
+link += -framework GraphicsServices
+link += -framework IOKit
+link += -framework JavaScriptCore
+link += -framework QuartzCore
+link += -framework SystemConfiguration
+link += -framework UIKit
+link += -framework WebCore
+link += -framework WebKit
+
+link += -lapr-1
+link += -lapt-pkg
+link += -lpcre
+
+link += -multiply_defined suppress
 
 all: Cydia
 
 clean:
 	rm -f Cydia
 
-Cydia: Cydia.mm ../uicaboodle.m/*.mm ../mobilesubstrate/*.h #makefile
-	$(target)g++ -march=armv6 -mcpu=arm1176jzf-s -mthumb -I../uicaboodle.m -I../mobilesubstrate -fobjc-call-cxx-cdtors -g0 -O2 -Wall -Werror -o $@ $(filter %.mm,$^) -framework UIKit -framework IOKit -framework CoreFoundation -framework Foundation -framework CoreGraphics -framework GraphicsServices -framework QuartzCore -framework JavaScriptCore -framework WebCore -framework WebKit -lobjc -lapt-pkg -lpcre -fobjc-exceptions -F"$${PKG_ROOT}"/System/Library/PrivateFrameworks -multiply_defined suppress -lapr-1
-
-sign: Cydia
-	CODESIGN_ALLOCATE=$$(which "$(target)codesign_allocate") ldid -Slaunch.xml Cydia
+Cydia: Cydia.mm Reachability.mm UICaboodle/*.mm
+	cycc -r4.2 -i$(ios) -o$@ -- $(filter %.mm,$^) $(flags) $(link)
 
-package: sign
+package: Cydia
 	rm -rf _
 	mkdir -p _/var/lib/cydia
 	
 	mkdir -p _/usr/libexec
-	svn export Library _/usr/libexec/cydia
-	cp -a /apl/tel/dest/iphoneos-arm/coreutils/usr/bin/du _/usr/libexec/cydia
+	cp -a Library _/usr/libexec/cydia
+	# XXX: fix du
+	#cp -a /apl/tel/dest/iphoneos-arm/coreutils/usr/bin/du _/usr/libexec/cydia
 	
 	mkdir -p _/System/Library
-	svn export LaunchDaemons _/System/Library/LaunchDaemons
+	cp -a LaunchDaemons _/System/Library/LaunchDaemons
 	
 	mkdir -p _/Applications
-	svn export Cydia.app _/Applications/Cydia.app
+	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
-	svn export CydiaSettings.bundle _/System/Library/PreferenceBundles/CydiaSettings.bundle
+	cp -a CydiaSettings.bundle _/System/Library/PreferenceBundles/CydiaSettings.bundle
 	
 	mkdir -p _/DEBIAN
 	echo "$$(cat control)"$$'\nInstalled-Size: '"$$(du -s _ | cut -f 1)" > _/DEBIAN/control
 	
-	dpkg-deb -Zlzma -b _ $(shell grep ^Package: control | cut -d ' ' -f 2-)_$(shell grep ^Version: control | cut -d ' ' -f 2)_iphoneos-arm.deb
+	$(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