Fix issue in 64-bit choose() reported by heardrwt.

[cycript.git] / xcode.mk

diff --git a/xcode.mk b/xcode.mk
index c42bb93c38b133f47780251dfe1e3c6f87616592..053503a4fd3aad8ed7e31abfe06fc551b593ecf5 100644 (file)
--- a/xcode.mk
+++ b/xcode.mk
@@ -28,31 +28,38 @@ version := $(shell git describe --always --tags --dirty="+" --match="v*" | sed -
 deb := cycript_$(version)_iphoneos-arm.deb
 
 cycript := 
-cycript += Cycript_/cycript
-cycript += Cycript_/libcycript.dylib
-cycript += Cycript_/libcycript-any.dylib
-cycript += Cycript_/libcycript-sys.dylib
-cycript += Cycript_/libcycript-sim.dylib
+cycript += Cycript.lib/cycript
+cycript += Cycript.lib/cycript0.9
+cycript += Cycript.lib/libcycript.dylib
+cycript += Cycript.lib/libcycript-any.dylib
+cycript += Cycript.lib/libcycript-sys.dylib
+cycript += Cycript.lib/libcycript-sim.dylib
 
 framework := 
 framework += Cycript.framework/Cycript
 framework += Cycript.framework/Headers/Cycript.h
 
+links := 
+links += Cycript.lib/libsubstrate.dylib
+links += Cycript.lib/cycript0.9
+
 all: cycript $(cycript) $(framework)
 
 cycript.zip: all
        rm -f $@
-       zip -r9y $@ cycript Cycript_ Cycript.framework
+       zip -r9y $@ cycript Cycript.lib Cycript.framework $(patsubst %,--exclude %,$(links))
+       zip -r9 $@ $(links)
 
 package: cycript.zip
 
-$(deb): Cycript_/cycript Cycript_/libcycript.dylib
+$(deb): Cycript.lib/cycript Cycript.lib/libcycript.dylib
        rm -rf package
        mkdir -p package/DEBIAN
        sed -e 's/#/$(version)/' control.in >package/DEBIAN/control
        mkdir -p package/usr/{bin,lib}
-       $(lipo) -extract armv6 -output package/usr/bin/cycript Cycript_/cycript
-       $(lipo) -extract armv6 -extract arm64 -output package/usr/lib/libcycript.dylib Cycript_/libcycript.dylib
+       cp -a modules package/usr/lib/cycript0.9
+       $(lipo) -extract armv6 -output package/usr/bin/cycript Cycript.lib/cycript
+       $(lipo) -extract armv6 -extract arm64 -output package/usr/lib/libcycript.dylib Cycript.lib/libcycript.dylib
        ln -s libcycript.dylib package/usr/lib/libcycript.0.dylib
        dpkg-deb -Zlzma -b package $@
 
@@ -60,7 +67,7 @@ deb: $(deb)
        ln -sf $< cycript.deb
 
 clean:
-       rm -rf cycript Cycript_ libcycript*.o
+       rm -rf cycript Cycript.lib libcycript*.o
 
 # make stubbornly refuses to believe that these @'s are bugs
 # http://osdir.com/ml/help-make-gnu/2012-04/msg00008.html
@@ -115,7 +122,7 @@ endef
 
 $(foreach arch,armv6 arm64,$(eval $(call build_arm,$(arch))))
 
-Cycript_/%.dylib: build.mac-i386/.libs/%.dylib build.mac-x86_64/.libs/%.dylib build.ios-armv6/.libs/%.dylib build.ios-arm64/.libs/%.dylib
+Cycript.lib/%.dylib: build.mac-i386/.libs/%.dylib build.mac-x86_64/.libs/%.dylib build.ios-armv6/.libs/%.dylib build.ios-arm64/.libs/%.dylib
        @mkdir -p $(dir $@)
        $(lipo) -create -output $@ $^
        install_name_tool -change /System/Library/{,Private}Frameworks/JavaScriptCore.framework/JavaScriptCore $@
@@ -126,15 +133,15 @@ Cycript_/%.dylib: build.mac-i386/.libs/%.dylib build.mac-x86_64/.libs/%.dylib bu
        install_name_tool -change /System/Library/{,Private}Frameworks/JavaScriptCore.framework/JavaScriptCore $@
        codesign -s $(codesign) --entitlement cycript-$(word 2,$(subst ., ,$(subst -, ,$*))).xml $@
 
-Cycript_/%: build.mac-i386/.libs/%_ build.mac-x86_64/.libs/%_ build.ios-armv6/.libs/%_
+Cycript.lib/%: build.mac-i386/.libs/%_ build.mac-x86_64/.libs/%_ build.ios-armv6/.libs/%_
        @mkdir -p $(dir $@)
        $(lipo) -create -output $@ $^
 
-Cycript_/libcycript-sys.dylib:
+Cycript.lib/libcycript-sys.dylib:
        @mkdir -p $(dir $@)
        ln -sf libcycript.dylib $@
 
-Cycript_/libcycript-sim.dylib: build.sim-i386/.libs/libcycript.dylib build.sim-x86_64/.libs/libcycript.dylib
+Cycript.lib/libcycript-sim.dylib: build.sim-i386/.libs/libcycript.dylib build.sim-x86_64/.libs/libcycript.dylib
        @mkdir -p $(dir $@)
        $(lipo) -create -output $@ $^
        codesign -s $(codesign) $@
@@ -154,6 +161,10 @@ Cycript.framework/Headers/Cycript.h: Cycript.h
        @mkdir -p $(dir $@)
        cp -a $< $@
 
+Cycript.lib/cycript0.9:
+       @mkdir -p $(dir $@)
+       ln -s ../modules $@
+
 cycript: cycript.in
        cp -af $< $@
        chmod 755 $@