X-Git-Url: https://git.saurik.com/cydia.git/blobdiff_plain/b129e6d9d0d67a3854b263ec4bf4f497e5d9f9ee..62664aee74d60bfac5b6497715b6e6020702373e:/makefile

diff --git a/makefile b/makefile
index 34849cb9..c76e489e 100644
--- a/makefile
+++ b/makefile
@@ -13,6 +13,9 @@ flags += -fmessage-length=0
 flags += -g0 -O2
 flags += -fvisibility=hidden
 
+flags += -idirafter icu/icuSources/common
+flags += -idirafter icu/icuSources/i18n
+
 flags += -Wall
 
 flags += -Wno-unknown-warning-option
@@ -41,14 +44,12 @@ libs += -framework WebKit
 
 libs += -lapr-1
 libs += -lapt-pkg
+libs += -licucore
 libs += -lpcre
 
 uikit := 
 uikit += -framework UIKit
 
-backrow := 
-backrow += -FAppleTV -framework BackRow -framework AppleTV
-
 version := $(shell ./version.sh)
 
 cycc = $(gxx) -arch armv6 -o $@ -miphoneos-version-min=2.0 -isysroot $(sdk) -idirafter /usr/include -F{sysroot,}/Library/Frameworks
@@ -115,28 +116,29 @@ sysroot: sysroot.sh
 
 MobileCydia: sysroot $(object) entitlements.xml
 	@echo "[link] $(object:Objects/%=%)"
-	@$(cycc) $(filter %.o,$^) $(flags) $(link) $(libs) $(uikit) -Wl,-sdk_version,7.0
+	@$(cycc) $(filter %.o,$^) $(flags) $(link) $(libs) $(uikit) -Wl,-sdk_version,8.0
 	@mkdir -p bins
 	@cp -a $@ bins/$@-$(version)
 	@echo "[strp] $@"
-	@strip -no_uuid $@
+	@strip $@
 	@echo "[uikt] $@"
 	@./uikit.sh $@
 	@echo "[sign] $@"
 	@ldid -T0 -Sentitlements.xml $@ || { rm -f $@ && false; }
 
-CydiaAppliance: CydiaAppliance.mm
-	$(cycc) $(filter %.mm,$^) $(flags) $(link) -bundle $(libs) $(backrow)
-
 cfversion: cfversion.mm
 	$(cycc) $(filter %.mm,$^) $(flags) $(link) -framework CoreFoundation
 	@ldid -T0 -S $@
 
+setnsfpn: setnsfpn.cpp
+	$(cycc) $(filter %.cpp,$^) $(flags) $(link)
+	@ldid -T0 -S $@
+
 postinst: postinst.mm Sources.mm Sources.h CyteKit/stringWithUTF8Bytes.mm CyteKit/stringWithUTF8Bytes.h CyteKit/UCPlatform.h
-	$(cycc) $(filter %.mm,$^) $(flags) $(link) -framework CoreFoundation -framework Foundation -framework UIKit -lpcre
+	$(cycc) -std=c++11 $(filter %.mm,$^) $(flags) $(link) -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 Library/startup
+debs/cydia_$(version)_iphoneos-arm.deb: MobileCydia preinst postinst cfversion setnsfpn $(images) $(shell find MobileCydia.app) cydia.control Library/firmware.sh Library/move.sh Library/startup
 	sudo rm -rf _
 	mkdir -p _/var/lib/cydia
 	
@@ -148,9 +150,10 @@ debs/cydia_$(version)_iphoneos-arm.deb: MobileCydia preinst postinst cfversion $
 	cp -a Library _/usr/libexec/cydia
 	cp -a sysroot/usr/bin/du _/usr/libexec/cydia
 	cp -a cfversion _/usr/libexec/cydia
+	cp -a setnsfpn _/usr/libexec/cydia
 	
-	mkdir -p _/System/Library
-	cp -a LaunchDaemons _/System/Library/LaunchDaemons
+	mkdir -p _/Library
+	cp -a LaunchDaemons _/Library/LaunchDaemons
 	
 	mkdir -p _/Applications
 	cp -a MobileCydia.app _/Applications/Cydia.app
@@ -163,13 +166,6 @@ debs/cydia_$(version)_iphoneos-arm.deb: MobileCydia preinst postinst cfversion $
 	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
-	
-	#mkdir -p _/Applications/Lowtide.app/Appliances
-	#ln -s {/Applications/AppleTV,_/Applications/Lowtide}.app/Appliances/Cydia.frappliance
-	
 	mkdir -p _/DEBIAN
 	./control.sh cydia.control _ >_/DEBIAN/control
 	cp -a preinst postinst _/DEBIAN/