Fixes for 1.0.2.

[cydia.git] / makefile

diff --git a/makefile b/makefile
index 365ced3d3efb646bf820fcd4b18bd19544a37567..3491be4bddf89b345667fb11ff7b3ee03b1a6e5f 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,16 +1,25 @@
-iPhone := 192.168.1.100
+ifndef PKG_TARG
+target :=
+else
+target := $(PKG_TARG)-
+endif
+
+frameworks :=
+
+ifneq ($(wildcard $(PKG_ROOT)/System/Library/*Frameworks/LayerKit.framework),)
+frameworks += -framework LayerKit
+endif
 
 all: Cydia exec
 
-test: all
-       scp -p Cydia saurik@$(iPhone):/dat
-       ssh saurik@$(iPhone) /dat/Cydia
+clean:
+       rm -f Cydia exec
 
 exec: exec.mm makefile
-       arm-apple-darwin-g++ -Wall -Werror -o $@ $< -framework Foundation -framework CoreFoundation -lobjc
+       $(target)g++ -Wall -Werror -o $@ $< -framework Foundation -framework CoreFoundation -lobjc
 
-Cydia-1.2: Cydia.mm *.h makefile
-       arm-apple-darwin-g++ -fobjc-abi-version=2 -fobjc-call-cxx-cdtors -g3 -O2 -Wall -o $@ $< -framework UIKit -framework IOKit -framework Foundation -framework CoreFoundation -framework CoreGraphics -framework GraphicsServices -lobjc -lapt-pkg -lpcre -fobjc-exceptions -save-temps -F $(Aspen)/System/Library/Frameworks -I $(Aspen)/usr/include -DTARGET_OS_EMBEDDED -DSRK_ASPEN
+Cydia: Cydia.mm ../uicaboodle.m/*.mm *.h makefile
+       $(target)g++ -I../uicaboodle.m -fobjc-call-cxx-cdtors -g0 -O2 -Wall -Werror -o $@ $(filter %.mm,$^) -framework UIKit -framework IOKit -framework CoreFoundation -framework Foundation -framework CoreGraphics -framework GraphicsServices $(frameworks) -lobjc -lapt-pkg -lpcre -fobjc-exceptions -I/apl/i20 -F"$${PKG_ROOT}"/System/Library/PrivateFrameworks
+       #CODESIGN_ALLOCATE=$$(which "$(target)codesign_allocate") /apl/tel/util/ldid -S Cydia
 
-Cydia: Cydia.mm *.h makefile
-       arm-apple-darwin-g++ -fobjc-call-cxx-cdtors -g3 -O2 -Wall -Werror -o $@ $< -framework UIKit -framework IOKit -framework Foundation -framework CoreFoundation -framework CoreGraphics -framework GraphicsServices -lobjc -lapt-pkg -lpcre -fobjc-exceptions
+.PHONY: all clean