Move system() for setnsfpn to a separate function.

[cydia.git] / makefile

diff --git a/makefile b/makefile
index 4beeadf1051c81bb333861e64c66a47b3e3b33ce..ce94153b83b470fb6b5a51abe52bf2af72aea413 100644 (file)
--- 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,6 +44,7 @@ libs += -framework WebKit
 
 libs += -lapr-1
 libs += -lapt-pkg
+libs += -licucore
 libs += -lpcre
 
 uikit := 
@@ -99,7 +103,7 @@ Objects/%.o: %.m $(header)
 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
 
@@ -115,11 +119,11 @@ 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] $@"
@@ -132,11 +136,15 @@ 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 +156,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