X-Git-Url: https://git.saurik.com/cydia.git/blobdiff_plain/543e172ac58fea0cdaa244dadfa9538c975cccc6..ca0a920d902e70044e20bbd4efd993e5d63789e7:/makefile

diff --git a/makefile b/makefile
index f98a9029..86b4784a 100644
--- a/makefile
+++ b/makefile
@@ -1,33 +1,11 @@
-dev := /Developer/Platforms/iPhoneOS.platform/Developer
-sdks := $(dev)/SDKs
-ioss := $(sort $(patsubst $(sdks)/iPhoneOS%.sdk,%,$(wildcard $(sdks)/iPhoneOS*.sdk)))
-ios := $(word $(words $(ioss)),$(ioss))
-
-# if you can tolerate clang, set this to blank
-gcc := 4.2
-
-ifeq ($(gcc),)
-gxx := $(dev)/usr/bin/clang++
-else
-gxx := $(dev)/usr/bin/g++-$(gcc)
-endif
+gxx := $(shell xcrun --sdk iphoneos -f g++)
+sdk := $(shell xcodebuild -sdk iphoneos -version Path)
 
 flags := 
 link := 
 libs := 
 
-ifeq (o,O) # gzip is actually better
-dpkg := /Library/Cydia/bin/dpkg-deb
-ifeq ($(wildcard $(dpkg)),$(dpkg))
-dpkg := $(dpkg) -zlzma
-else
-dpkg := dpkg-deb -zbzip2
-endif
-else
-dpkg := dpkg-deb
-endif
-
-sdk := $(sdks)/iPhoneOS$(ios).sdk
+dpkg := dpkg-deb -Zlzma
 
 flags += -F$(sdk)/System/Library/PrivateFrameworks
 flags += -I. -isystem sysroot/usr/include
@@ -35,16 +13,15 @@ flags += -fmessage-length=0
 flags += -g0 -O2
 flags += -fvisibility=hidden
 
+flags += -idirafter icu/icuSources/common
+flags += -idirafter icu/icuSources/i18n
+
 flags += -Wall
 
-ifeq ($(gcc),)
 flags += -Wno-unknown-warning-option
 flags += -Wno-logical-op-parentheses
-else
-flags += -fobjc-exceptions
-flags += -fno-guess-branch-probability
-endif
-
+flags += -Wno-dangling-else
+flags += -Wno-shift-op-parentheses
 flags += -Wno-deprecated-declarations
 
 xflags :=
@@ -59,33 +36,32 @@ libs += -framework CoreGraphics
 libs += -framework Foundation
 libs += -framework GraphicsServices
 libs += -framework IOKit
-libs += -framework JavaScriptCore
 libs += -framework QuartzCore
 libs += -framework SpringBoardServices
 libs += -framework SystemConfiguration
 libs += -framework WebCore
 libs += -framework WebKit
 
-libs += -lapr-1
 libs += -lapt-pkg
-libs += -lpcre
+libs += -licucore
 
 uikit := 
 uikit += -framework UIKit
 
-backrow := 
-backrow += -FAppleTV -framework BackRow -framework AppleTV
-
 version := $(shell ./version.sh)
 
-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$@
+cycc = $(gxx) -arch armv6 -o $@ -miphoneos-version-min=2.0 -isysroot $(sdk) -idirafter /usr/include -F{sysroot,}/Library/Frameworks
+
+cycc += -marm # @synchronized
+cycc += -mcpu=arm1176jzf-s
+cycc += -mllvm -arm-reserve-r9
+link += -lgcc_s.1
 
 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 Version.mm iPhonePrivate.h Cytore.hpp lookup3.c Sources.h Sources.mm
+code += MobileCydia.mm Version.mm iPhonePrivate.h Cytore.hpp lookup3.c Sources.h Sources.mm DiskUsage.cpp
 
 source := $(filter %.m,$(code)) $(filter %.mm,$(code))
 source += $(filter %.c,$(code)) $(filter %.cpp,$(code))
@@ -119,12 +95,17 @@ Objects/%.o: %.m $(header)
 	@echo "[cycc] $<"
 	@$(cycc) -c $< $(flags)
 
+Objects/%.o: %.cpp $(header)
+	@mkdir -p $(dir $@)
+	@echo "[cycc] $<"
+	@$(cycc) -std=c++11 -c $< $(flags) $(xflags)
+
 Objects/%.o: %.mm $(header)
 	@mkdir -p $(dir $@)
 	@echo "[cycc] $<"
-	@$(cycc) -c $< $(flags) $(xflags)
+	@$(cycc) -std=c++11 -c $< $(flags) $(xflags)
 
-Objects/Version.o: version.h
+Objects/Version.o: Version.h
 
 Images/%.png: %.png
 	@mkdir -p $(dir $@)
@@ -138,26 +119,33 @@ sysroot: sysroot.sh
 
 MobileCydia: sysroot $(object) entitlements.xml
 	@echo "[link] $(object:Objects/%=%)"
-	@$(cycc) $(filter %.o,$^) $(flags) $(link) $(libs) $(uikit)
+	@$(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) -framework CoreFoundation
+	$(cycc) $(filter %.mm,$^) $(flags) $(link) -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) $(link) -framework CoreFoundation -framework Foundation -framework UIKit -lpcre
+setnsfpn: setnsfpn.cpp
+	$(cycc) $(filter %.cpp,$^) $(flags) $(link)
 	@ldid -T0 -S $@
 
-debs/cydia_$(version)_iphoneos-arm.deb: MobileCydia preinst postinst cfversion $(images) $(shell find MobileCydia.app) cydia.control Library/firmware.sh
+cydo: cydo.cpp
+	$(cycc) -std=c++11 $(filter %.cpp,$^) $(flags) $(link) -Wno-deprecated-writable-strings
+	@ldid -T0 -S $@
+
+postinst: postinst.mm CyteKit/stringWithUTF8Bytes.mm CyteKit/stringWithUTF8Bytes.h CyteKit/UCPlatform.h
+	$(cycc) -std=c++11 $(filter %.mm,$^) $(flags) $(link) -framework CoreFoundation -framework Foundation -framework UIKit
+	@ldid -T0 -S $@
+
+debs/cydia_$(version)_iphoneos-arm.deb: MobileCydia preinst postinst cfversion setnsfpn cydo $(images) $(shell find MobileCydia.app) cydia.control Library/firmware.sh Library/move.sh Library/startup
 	sudo rm -rf _
 	mkdir -p _/var/lib/cydia
 	
@@ -167,16 +155,19 @@ debs/cydia_$(version)_iphoneos-arm.deb: MobileCydia preinst postinst cfversion $
 	
 	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
+	cp -a setnsfpn _/usr/libexec/cydia
+	
+	cp -a cydo _/usr/libexec/cydia
+	sudo chmod 6755 _/usr/libexec/cydia/cydo
 	
-	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
 	rm -rf _/Applications/Cydia.app/*.lproj
-	cp -a MobileCydia _/Applications/Cydia.app/MobileCydia
+	cp -a MobileCydia _/Applications/Cydia.app/Cydia
 	
 	cd MobileCydia.app && find . -name '*.png' -exec cp -af ../Images/MobileCydia.app/{} ../_/Applications/Cydia.app/{} ';'
 	
@@ -184,13 +175,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/
@@ -199,7 +183,6 @@ debs/cydia_$(version)_iphoneos-arm.deb: MobileCydia preinst postinst cfversion $
 	
 	sudo chown -R 0 _
 	sudo chgrp -R 0 _
-	sudo chmod 6755 _/Applications/Cydia.app/MobileCydia
 	
 	mkdir -p debs
 	ln -sf debs/cydia_$(version)_iphoneos-arm.deb Cydia.deb