Rename CYWebView to CyteWebView.

[cydia.git] / makefile

diff --git a/makefile b/makefile
index 2a227cc61100935be6a01597a7a8c8f2d6ac6c80..98a3ef2e3b9acadd5ab3748a9d126e54a5ce7fdf 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,6 +1,7 @@
 sdks := /Developer/Platforms/iPhoneOS.platform/Developer/SDKs
 sdks := /Developer/Platforms/iPhoneOS.platform/Developer/SDKs

+ioss := $(sort $(patsubst $(sdks)/iPhoneOS%.sdk,%,$(wildcard $(sdks)/iPhoneOS*.sdk)))

 
 

-ios := 4.0
+ios := $(word $(words $(ioss)),$(ioss))

 gcc := 4.2
 
 flags := 
 gcc := 4.2
 
 flags := 


@@ -50,9 +51,11 @@ uikit += -framework UIKit
 backrow := 
 backrow += -FAppleTV -framework BackRow -framework AppleTV
 
 backrow := 
 backrow += -FAppleTV -framework BackRow -framework AppleTV
 

+version := $(shell ./version.sh)
+

 #cycc = cycc -r4.2 -i$(ios) -o$@
 gxx := /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/g++-$(gcc)
 #cycc = cycc -r4.2 -i$(ios) -o$@
 gxx := /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/g++-$(gcc)

-cycc = $(gxx) -mthumb -arch armv6 -o $@ -mcpu=arm1176jzf-s -miphoneos-version-min=2.0 -isysroot $(sdk) -idirafter /usr/include -F/Library/Frameworks
+cycc = $(gxx) -mthumb -arch armv6 -o $@ -mcpu=arm1176jzf-s -miphoneos-version-min=2.0 -isysroot $(sdk) -idirafter /usr/include -F{sysroot,}/Library/Frameworks

 
 all: MobileCydia
 
 
 all: MobileCydia
 


@@ -62,11 +65,13 @@ clean:
 %.o: %.c
        $(cycc) -c -o $@ -x c $<
 
 %.o: %.c
        $(cycc) -c -o $@ -x c $<
 

-Version.h:
-       ./Version.h.sh
+sysroot:
+       @echo "Please read compiling.txt: you do not have a ./sysroot/ folder with the on-device requirements." 1>&2
+       @echo 1>&2
+       @exit 1

 
 

-MobileCydia: Version.h 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)
+MobileCydia: sysroot MobileCydia.mm CyteKit/*.h CyteKit/*.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) -DCYDIA_VERSION='"$(version)"'

        ldid -Slaunch.xml $@ || { rm -f $@ && false; }
 
 CydiaAppliance: CydiaAppliance.mm
        ldid -Slaunch.xml $@ || { rm -f $@ && false; }
 
 CydiaAppliance: CydiaAppliance.mm


@@ -91,9 +96,6 @@ package: MobileCydia
        #cp -a Cydia.frappliance _/Applications/Lowtide.app/Appliances
        #cp -a CydiaAppliance _/Applications/Lowtide.app/Appliances/Cydia.frappliance
        
        #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 _/DEBIAN
        ./control.sh _ >_/DEBIAN/control
        
        mkdir -p _/DEBIAN
        ./control.sh _ >_/DEBIAN/control
        


@@ -104,7 +106,7 @@ package: MobileCydia
        sudo chmod 6755 _/Applications/Cydia.app/MobileCydia
        
        mkdir -p debs
        sudo chmod 6755 _/Applications/Cydia.app/MobileCydia
        
        mkdir -p debs

-       ln -sf debs/cydia_$$(./version.sh)_iphoneos-arm.deb Cydia.deb
+       ln -sf debs/cydia_$(version)_iphoneos-arm.deb Cydia.deb

        $(dpkg) -b _ Cydia.deb
        @echo "$$(stat -L -f "%z" Cydia.deb) $$(stat -f "%Y" Cydia.deb)"
 
        $(dpkg) -b _ Cydia.deb
        @echo "$$(stat -L -f "%z" Cydia.deb) $$(stat -f "%Y" Cydia.deb)"