Remove StripVersion(), inlining the code to the one place it is used.

[cydia.git] / makefile

diff --git a/makefile b/makefile
index dcd482a93c06f44e8aa5ddcbf9cf5810382adc86..a3c3b6f092a94b7544eb2d490d46094fc557ed36 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,4 +1,10 @@
+ifeq (o,O)
+ios := 2.0
+gcc := 4.0
+else

 ios := 3.2
 ios := 3.2

+gcc := 4.2
+endif

 
 flags := 
 link := 
 
 flags := 
 link := 


@@ -6,7 +12,9 @@ link :=
 #dpkg := /Library/Cydia/bin/dpkg-deb -Zlzma
 dpkg := dpkg-deb
 
 #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
 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 JavaScriptCore
 link += -framework QuartzCore
 link += -framework SystemConfiguration

-link += -framework UIKit

 link += -framework WebCore
 link += -framework WebKit
 
 link += -framework WebCore
 link += -framework WebKit
 


@@ -31,15 +38,29 @@ link += -lpcre
 
 link += -multiply_defined suppress
 
 
 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:
 
 clean:

-       rm -f Cydia
+       rm -f MobileCydia
+
+MobileCydia: MobileCydia.mm UICaboodle/*.h UICaboodle/*.mm iPhonePrivate.h
+       $(cycc) $(filter %.mm,$^) $(flags) $(link) $(uikit)
+       ldid -Slaunch.xml $@ || { rm -f $@ && false; }

 
 

-Cydia: Cydia.mm Reachability.mm UICaboodle/*.mm
-       cycc -r4.2 -i$(ios) -o$@ -- $(filter %.mm,$^) $(flags) $(link)
+CydiaAppliance: CydiaAppliance.mm
+       $(cycc) $(filter %.mm,$^) $(flags) -bundle $(link) $(backrow)

 
 

-package: Cydia
+package: MobileCydia

        sudo rm -rf _
        mkdir -p _/var/lib/cydia
        
        sudo rm -rf _
        mkdir -p _/var/lib/cydia
        


@@ -51,8 +72,12 @@ package: Cydia
        cp -a LaunchDaemons _/System/Library/LaunchDaemons
        
        mkdir -p _/Applications
        cp -a LaunchDaemons _/System/Library/LaunchDaemons
        
        mkdir -p _/Applications

-       cp -a Cydia.app _/Applications/Cydia.app
-       cp -a Cydia _/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 _/System/Library/PreferenceBundles
        cp -a CydiaSettings.bundle _/System/Library/PreferenceBundles/CydiaSettings.bundle


@@ -62,7 +87,7 @@ package: Cydia
        
        sudo chown -R 0 _
        sudo chgrp -R 0 _
        
        sudo chown -R 0 _
        sudo chgrp -R 0 _

-       sudo chmod 6755 _/Applications/Cydia.app/Cydia_
+       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
 
        
        $(dpkg) -b _ $(shell grep ^Package: control | cut -d ' ' -f 2-)_$(shell grep ^Version: control | cut -d ' ' -f 2)_iphoneos-arm.deb