Initial clang compatability with some @synchronized hacks.

[cydia.git] / makefile

diff --git a/makefile b/makefile
index 8be707e4d8ce1e7b3f00bf68c297e78a7f39a712..b4e33e223d0942e81df502b69033558c94dafda5 100644 (file)
--- a/makefile
+++ b/makefile
@@ -2,7 +2,9 @@ sdks := /Developer/Platforms/iPhoneOS.platform/Developer/SDKs
 ioss := $(sort $(patsubst $(sdks)/iPhoneOS%.sdk,%,$(wildcard $(sdks)/iPhoneOS*.sdk)))
 
 ios := $(word $(words $(ioss)),$(ioss))
+
 gcc := 4.2
+gcc :=
 
 flags := 
 link := 
@@ -21,18 +23,24 @@ endif
 sdk := $(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 += -I. -isystem sysroot/usr/include
+flags += -Wall -Wno-deprecated-declarations
+flags += -Wno-logical-op-parentheses
 flags += -fmessage-length=0
 flags += -g0 -O2
 flags += -fobjc-exceptions
-flags += -fno-guess-branch-probability
 flags += -fvisibility=hidden
 
+ifneq ($(gcc),)
+flags += -fno-guess-branch-probability
+endif
+
 xflags :=
 xflags += -fobjc-call-cxx-cdtors
 xflags += -fvisibility-inlines-hidden
 
+link += -Lsysroot/usr/lib
+
 link += -framework CoreFoundation
 link += -framework CoreGraphics
 link += -framework Foundation
@@ -59,15 +67,20 @@ backrow += -FAppleTV -framework BackRow -framework AppleTV
 
 version := $(shell ./version.sh)
 
-#cycc = cycc -r4.2 -i$(ios) -o$@
+ifeq ($(gcc),)
+gxx := /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/clang++
+else
 gxx := /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/g++-$(gcc)
+endif
+
 cycc = $(gxx) -mthumb -arch armv6 -o $@ -mcpu=arm1176jzf-s -miphoneos-version-min=2.0 -isysroot $(sdk) -idirafter /usr/include -F{sysroot,}/Library/Frameworks
+#cycc = cycc -r4.2 -i$(ios) -o$@
 
 dirs := Menes CyteKit Cydia SDURLCache
 
 code := $(foreach dir,$(dirs),$(wildcard $(foreach ext,h hpp c cpp m mm,$(dir)/*.$(ext))))
 code := $(filter-out SDURLCache/SDURLCacheTests.m,$(code))
-code += MobileCydia.mm iPhonePrivate.h Cytore.hpp lookup3.c
+code += MobileCydia.mm Version.mm iPhonePrivate.h Cytore.hpp lookup3.c Sources.h Sources.mm
 
 source := $(filter %.m,$(code)) $(filter %.mm,$(code))
 source += $(filter %.c,$(code)) $(filter %.cpp,$(code))
@@ -80,7 +93,7 @@ object := $(object:.m=.o)
 object := $(object:.mm=.o)
 object := $(object:%=Objects/%)
 
-images := $(shell find MobileCydia.app -name '*.png')
+images := $(shell find MobileCydia.app/ -type f -name '*.png')
 images := $(images:%=Images/%)
 
 lproj_deb := debs/cydia-lproj_$(version)_iphoneos-arm.deb
@@ -88,7 +101,7 @@ lproj_deb := debs/cydia-lproj_$(version)_iphoneos-arm.deb
 all: MobileCydia
 
 clean:
-       rm -f MobileCydia
+       rm -f MobileCydia postinst
        rm -rf Objects/ Images/
 
 Objects/%.o: %.c $(header)
@@ -106,30 +119,40 @@ Objects/%.o: %.mm $(header)
        @echo "[cycc] $<"
        @$(cycc) -c -o $@ $< $(flags) $(xflags)
 
-Objects/MobileCydia.o: version.h
+Objects/Version.o: version.h
 
 Images/%.png: %.png
        @mkdir -p $(dir $@)
        @echo "[pngc] $<"
        @./pngcrush.sh $< $@
 
-sysroot:
-       @echo "Please read compiling.txt: you do not have a ./sysroot/ folder with the on-device requirements." 1>&2
+sysroot: sysroot.sh
+       @echo "Your ./sysroot/ is either missing or out of date. Please read compiling.txt for help." 1>&2
        @echo 1>&2
        @exit 1
 
-MobileCydia: sysroot $(object)
+MobileCydia: sysroot $(object) entitlements.xml
        @echo "[link] $(object:Objects/%=%)"
        @$(cycc) $(filter %.o,$^) $(flags) $(link) $(uikit)
+       @mkdir -p bins
+       @cp -a $@ bins/$@-$(version)
        @echo "[strp] $@"
        @strip -no_uuid $@
        @echo "[sign] $@"
-       @ldid -T0 -Slaunch.xml $@ || { rm -f $@ && false; }
+       @ldid -T0 -Sentitlements.xml $@ || { rm -f $@ && false; }
 
 CydiaAppliance: CydiaAppliance.mm
        $(cycc) $(filter %.mm,$^) $(flags) -bundle $(link) $(backrow)
 
-debs/cydia_$(version)_iphoneos-arm.deb: MobileCydia $(images) $(shell find MobileCydia.app) cydia.control
+cfversion: cfversion.mm
+       $(cycc) $(filter %.mm,$^) $(flags) -framework CoreFoundation
+       @ldid -T0 -S $@
+
+postinst: postinst.mm Sources.mm Sources.h CyteKit/stringWithUTF8Bytes.mm CyteKit/stringWithUTF8Bytes.h CyteKit/UCPlatform.h
+       $(cycc) $(filter %.mm,$^) $(flags) -framework CoreFoundation -framework Foundation -framework UIKit -lpcre
+       @ldid -T0 -S $@
+
+debs/cydia_$(version)_iphoneos-arm.deb: MobileCydia preinst postinst cfversion $(images) $(shell find MobileCydia.app) cydia.control Library/firmware.sh
        sudo rm -rf _
        mkdir -p _/var/lib/cydia
        
@@ -140,6 +163,7 @@ debs/cydia_$(version)_iphoneos-arm.deb: MobileCydia $(images) $(shell find Mobil
        mkdir -p _/usr/libexec
        cp -a Library _/usr/libexec/cydia
        cp -a sysroot/usr/bin/du _/usr/libexec/cydia
+       cp -a cfversion _/usr/libexec/cydia
        
        mkdir -p _/System/Library
        cp -a LaunchDaemons _/System/Library/LaunchDaemons
@@ -151,6 +175,10 @@ debs/cydia_$(version)_iphoneos-arm.deb: MobileCydia $(images) $(shell find Mobil
        
        cd MobileCydia.app && find . -name '*.png' -exec cp -af ../Images/MobileCydia.app/{} ../_/Applications/Cydia.app/{} ';'
        
+       mkdir -p _/Applications/Cydia.app/Sources
+       ln -s /usr/share/bigboss/icons/bigboss.png _/Applications/Cydia.app/Sources/apt.bigboss.us.com.png
+       ln -s /usr/share/bigboss/icons/planetiphones.png _/Applications/Cydia.app/Sections/"Planet-iPhones Mods.png"
+       
        #mkdir -p _/Applications/AppleTV.app/Appliances
        #cp -a Cydia.frappliance _/Applications/AppleTV.app/Appliances
        #cp -a CydiaAppliance _/Applications/AppleTV.app/Appliances/Cydia.frappliance
@@ -160,7 +188,7 @@ debs/cydia_$(version)_iphoneos-arm.deb: MobileCydia $(images) $(shell find Mobil
        
        mkdir -p _/DEBIAN
        ./control.sh cydia.control _ >_/DEBIAN/control
-       cp -a preinst _/DEBIAN/
+       cp -a preinst postinst _/DEBIAN/
        
        find _ -exec touch -t "$$(date -j -f "%s" +"%Y%m%d%H%M.%S" "$$(git show --format='format:%ct' | head -n 1)")" {} ';'
        
@@ -181,7 +209,6 @@ $(lproj_deb): $(shell find MobileCydia.app -name '*.strings') cydia-lproj.contro
        
        mkdir -p __/DEBIAN
        ./control.sh cydia-lproj.control __ >__/DEBIAN/control
-       cp -a preinst __/DEBIAN/
        
        sudo chown -R 0 __
        sudo chgrp -R 0 __
@@ -193,4 +220,4 @@ $(lproj_deb): $(shell find MobileCydia.app -name '*.strings') cydia-lproj.contro
        
 package: debs/cydia_$(version)_iphoneos-arm.deb $(lproj_deb)
 
-.PHONY: all clean package sign
+.PHONY: all clean package