X-Git-Url: https://git.saurik.com/cydia.git/blobdiff_plain/7fc0298900fd912b962229f23d090fc422320019..5c624298a1145bdcd7e279642f9155ab114b94c2:/makefile?ds=inline

diff --git a/makefile b/makefile
index 9a1145dc..1bfc33ca 100644
--- a/makefile
+++ b/makefile
@@ -1,13 +1,8 @@
 sdks := /Developer/Platforms/iPhoneOS.platform/Developer/SDKs
+ioss := $(sort $(patsubst $(sdks)/iPhoneOS%.sdk,%,$(wildcard $(sdks)/iPhoneOS*.sdk)))
 
-ios := 3.2
-#ios := 2.0
-
-ifeq ($(patsubst 2%,2,$(ios)),2)
-gcc := 4.0
-else
+ios := $(word $(words $(ioss)),$(ioss))
 gcc := 4.2
-endif
 
 flags := 
 link := 
@@ -30,7 +25,13 @@ 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
+flags += -fobjc-exceptions
+flags += -fno-guess-branch-probability
+flags += -fvisibility=hidden
+
+xflags :=
+xflags += -fobjc-call-cxx-cdtors
+xflags += -fvisibility-inlines-hidden
 
 link += -framework CoreFoundation
 link += -framework CoreGraphics
@@ -56,26 +57,77 @@ uikit += -framework UIKit
 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 = $(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
+
+flags += -DCYDIA_VERSION='"$(version)"'
+
+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
+
+source := $(filter %.m,$(code)) $(filter %.mm,$(code))
+source += $(filter %.c,$(code)) $(filter %.cpp,$(code))
+header := $(filter %.h,$(code)) $(filter %.hpp,$(code))
+
+object := $(source)
+object := $(object:.c=.o)
+object := $(object:.cpp=.o)
+object := $(object:.m=.o)
+object := $(object:.mm=.o)
+object := $(object:%=Objects/%)
+
+images := $(shell find MobileCydia.app -name '*.png')
+images := $(images:%=Images/%)
 
 all: MobileCydia
 
 clean:
 	rm -f MobileCydia
-
-%.o: %.c
-	$(cycc) -c -o $@ -x c $<
-
-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; }
+	rm -rf Objects/ Images/
+
+Objects/%.o: %.c $(header)
+	@mkdir -p $(dir $@)
+	@echo "[cycc] $<"
+	@$(cycc) -c -o $@ -x c $<
+
+Objects/%.o: %.m $(header)
+	@mkdir -p $(dir $@)
+	@echo "[cycc] $<"
+	@$(cycc) -c -o $@ $< $(flags)
+
+Objects/%.o: %.mm $(header)
+	@mkdir -p $(dir $@)
+	@echo "[cycc] $<"
+	@$(cycc) -c -o $@ $< $(flags) $(xflags)
+
+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
+	@echo 1>&2
+	@exit 1
+
+MobileCydia: sysroot $(object)
+	@echo "[link] $(object:Objects/%=%)"
+	@$(cycc) $(filter %.o,$^) $(flags) $(link) $(uikit)
+	@echo "[strp] $@"
+	@strip -no_uuid $@
+	@echo "[sign] $@"
+	@ldid -T0 -Slaunch.xml $@ || { rm -f $@ && false; }
 
 CydiaAppliance: CydiaAppliance.mm
 	$(cycc) $(filter %.mm,$^) $(flags) -bundle $(link) $(backrow)
 
-package: MobileCydia
+package: MobileCydia $(images)
 	sudo rm -rf _
 	mkdir -p _/var/lib/cydia
 	
@@ -90,24 +142,23 @@ package: MobileCydia
 	cp -a MobileCydia.app _/Applications/Cydia.app
 	cp -a MobileCydia _/Applications/Cydia.app/MobileCydia
 	
+	cd MobileCydia.app && find . -name '*.png' -exec cp -af ../Images/MobileCydia.app/{} ../_/Applications/Cydia.app/{} ';'
+	
 	#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 _/DEBIAN
 	./control.sh _ >_/DEBIAN/control
 	
-	find _ -name '*.png' -exec ./pngcrush.sh '{}' ';'
+	find _ -exec touch -t "$$(date -j -f "%s" +"%Y%m%d%H%M.%S" "$$(git show --format='format:%ct' | head -n 1)")" {} ';'
 	
 	sudo chown -R 0 _
 	sudo chgrp -R 0 _
 	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)"