Merge branch 'master' of saurik.com:cydia

[cydia.git] / makefile

diff --git a/makefile b/makefile
index e13ebfabc7190e8097d0073c9c2824cc4bbd6b3f..3898b49c99a4b49c849f0d6b9e51a50b09a0e93d 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,42 +1,82 @@
-ifndef PKG_TARG
-target :=
+ifeq (o,O)
+ios := 2.0
+gcc := 4.0
 else
-target := $(PKG_TARG)-
+ios := 3.2
+gcc := 4.2
 endif
 
+flags := 
+link := 
+
+#dpkg := /Library/Cydia/bin/dpkg-deb -Zlzma
+dpkg := dpkg-deb
+
+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
+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
+
+#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 UICaboodle/*.mm ../mobilesubstrate/*.h #makefile
-       $(target)g++ -march=armv6 -mcpu=arm1176jzf-s -mthumb -I. -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
+Cydia: Cydia.mm UICaboodle/*.mm iPhonePrivate.h
+       $(cycc) $(filter %.mm,$^) $(flags) $(link)
+       ldid -Slaunch.xml $@
 
-sign: Cydia
-       CODESIGN_ALLOCATE=$$(which "$(target)codesign_allocate") ldid -Slaunch.xml Cydia
-
-package: sign
-       rm -rf _
+package: Cydia
+       sudo 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
+       cp -a sysroot/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
+       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