Ported back to the iPhone.

diff --git a/Darwin-arm.mk b/Darwin-arm.mk
index 875f25f96d56be4dd4fdaff47357007c7d522fa9..974a5769ba29f64fc22e050e0bba6d2f72d3ac0a 100644 (file)
--- a/Darwin-arm.mk
+++ b/Darwin-arm.mk
@@ -4,7 +4,7 @@ all += Cycript.$(dll) #cyrver
 
 arch := iphoneos-arm
 ldid := ldid -S
 
 arch := iphoneos-arm
 ldid := ldid -S

-link += -framework UIKit
+console += -framework UIKit

 
 Cycript.$(dll): Connector.o
        $(target)g++ $(flags) -dynamiclib -o $@ $(filter %.o,$^) \
 
 Cycript.$(dll): Connector.o
        $(target)g++ $(flags) -dynamiclib -o $@ $(filter %.o,$^) \

diff --git a/Darwin.mk b/Darwin.mk
index a36cdb428431f2c5a989b700930baca8b5584231..0d9a08383779dbcd42f9882d091999c525c21694 100644 (file)
--- a/Darwin.mk
+++ b/Darwin.mk
@@ -5,11 +5,12 @@ header += Struct.hpp ObjectiveC.hpp
 code += ObjectiveC.o Library.o
 filters += ObjC
 flags += -DCY_ATTACH -DCY_EXECUTE
 code += ObjectiveC.o Library.o
 filters += ObjC
 flags += -DCY_ATTACH -DCY_EXECUTE

-flags += -lobjc -framework CoreFoundation
-link += -framework Foundation
+link += -lobjc -framework CoreFoundation
+console += -framework Foundation

 library += -install_name /usr/lib/libcycript.$(dll)
 library += -framework Foundation -framework CFNetwork
 library += -framework JavaScriptCore -framework WebCore
 library += -install_name /usr/lib/libcycript.$(dll)
 library += -framework Foundation -framework CFNetwork
 library += -framework JavaScriptCore -framework WebCore

+library += -lsubstrate

 
 Struct.hpp:
        $$($(target)gcc -print-prog-name=cc1obj) -print-objc-runtime-info </dev/null >$@
 
 Struct.hpp:
        $$($(target)gcc -print-prog-name=cc1obj) -print-objc-runtime-info </dev/null >$@

diff --git a/makefile b/makefile
index 2f95a531e5efd3f3c87406e5b49609837d8836c8..4a7ded5987daf57433361af8eb7eb1b8ba5490a0 100644 (file)
--- a/makefile
+++ b/makefile
@@ -29,8 +29,8 @@ filters := C
 ldid := echo
 dll := so
 apr := $(shell apr-1-config --link-ld)
 ldid := echo
 dll := so
 apr := $(shell apr-1-config --link-ld)

-library := $(apr) -lffi #-lsubstrate
-link := $(apr) -lreadline
+library := $(apr) -lffi
+console := $(apr) -lreadline

 
 uname_s := $(shell uname -s)
 uname_p := $(shell uname -p)
 
 uname_s := $(shell uname -s)
 uname_p := $(shell uname -p)


@@ -110,11 +110,11 @@ lex.cy.o: lex.cy.c Cycript.tab.hh Parser.hpp Pooling.hpp
        $(target)g++ $(flags) -c -o $@ $<
 
 libcycript.$(dll): $(code)
        $(target)g++ $(flags) -c -o $@ $<
 
 libcycript.$(dll): $(code)

-       $(target)g++ $(flags) -shared -dynamiclib -o $@ $(filter %.o,$^) $(library)
+       $(target)g++ $(flags) -shared -dynamiclib -o $@ $(filter %.o,$^) $(library) $(link)

        $(ldid) -S $@
 
 cycript: Console.o libcycript.$(dll)
        $(ldid) -S $@
 
 cycript: Console.o libcycript.$(dll)

-       $(target)g++ $(flags) -o $@ $(filter %.o,$^) -L. -lcycript $(link)
+       $(target)g++ $(flags) -o $@ $(filter %.o,$^) -L. -lcycript $(console) $(link)

        $(ldid) -S cycript
 
 package: $(deb)
        $(ldid) -S cycript
 
 package: $(deb)