Naming sanity: RoleController -> CYSettingsController; SettingsController -> CYPackag...

[cydia.git] / makefile

diff --git a/makefile b/makefile
index b96733f227eecdd40e0b1d1d44790e56a3e284c7..d9326179667ea6c06d645258e896eaf83c2836cb 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,9 +1,11 @@
-ifeq (o,O)
-ios := 2.0
-gcc := 4.0
-else
+sdks := /Developer/Platforms/iPhoneOS.platform/Developer/SDKs
+
+ifeq ($(findstring iPhoneOS2.0.sdk,$(wildcard $(sdks)/iPhoneOS*.sdk)),)
 ios := 3.2
 gcc := 4.2
+else
+ios := 2.0
+gcc := 4.0
 endif
 
 flags := 
@@ -12,7 +14,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
@@ -56,8 +58,8 @@ clean:
 %.o: %.c
        $(cycc) -c -o $@ -x c $<
 
-MobileCydia: MobileCydia.mm UICaboodle/*.h UICaboodle/*.mm iPhonePrivate.h lookup3.o
-       $(cycc) $(filter %.mm,$^) $(filter %.o,$^) $(flags) $(link) $(uikit)
+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
@@ -86,12 +88,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