X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/5999c31517bb72b55257d25f482edc566adec045..478d4ed0925f2e61fbcdc4672104620342c52c4c:/makefile

diff --git a/makefile b/makefile
index 0e768d5..c893967 100644
--- a/makefile
+++ b/makefile
@@ -6,27 +6,31 @@ endif
 
 package:
 
-flags := -mthumb -g3 -O0 -Wall -Werror -I.
+flags := -mthumb -g3 -O0 -Wall -Werror -I. -fno-common
+flags += -F${PKG_ROOT}/System/Library/PrivateFrameworks
 
 all: cycript libcycript.dylib libcycript.plist
 
 clean:
-	rm -f *.o libcycript.dylib cycript libcycript.plist Struct.hpp lex.cy.c Cycript.tab.cc Cycript.tab.hh location.hh position.hh
+	rm -f *.o libcycript.dylib cycript libcycript.plist Struct.hpp lex.cy.c Cycript.tab.cc Cycript.tab.hh location.hh position.hh stack.hh
 
 libcycript.plist: Bridge.def
-	sed -e 's/^C/0/;s/^F/1/;s/^V/2/' Bridge.def | while read -r line; do \
-	    if [[ $$line == '' ]]; then \
-	        continue; \
-	    fi; \
-	    set $$line; \
-	    if [[ $$1 =~ [#fl] ]]; then \
-	        continue; \
-	    fi; \
-	    echo "$$2 = ($$1, \"$$3\");";  \
-	done >$@
+	{ \
+	    sed -e 's/^C/0/;s/^F/1/;s/^V/2/' Bridge.def | while read -r line; do \
+	        if [[ $$line == '' ]]; then \
+	            continue; \
+	        fi; \
+	        set $$line; \
+	        if [[ $$1 =~ [#fl:] ]]; then \
+	            continue; \
+	        fi; \
+	        echo "$$2 = ($$1, \"$$3\");";  \
+	    done; \
+	    grep ^: Bridge.def | sed -e 's/^: \([^ ]*\) \(.*\)/":\1" = "\2";/'; \
+	} >$@
 
 Cycript.tab.cc Cycript.tab.hh location.hh position.hh: Cycript.y
-	bison -v $<
+	bison -v --report=state $<
 
 lex.cy.c: Cycript.l
 	flex $<
@@ -38,26 +42,29 @@ Struct.hpp:
 #	./Parser.py <Parser.dat >$@
 
 %.o: sig/%.cpp
-	$(target)g++ -c -o $@ $< $(flags)
+	$(target)g++ $(flags) -c -o $@ $<
 
 Cycript.tab.o: Cycript.tab.cc Cycript.tab.hh Parser.hpp Pooling.hpp
-	$(target)g++ -c -o $@ $< $(flags)
+	$(target)g++ $(flags) -c -o $@ $<
 
 lex.cy.o: lex.cy.c Cycript.tab.hh Parser.hpp Pooling.hpp
-	$(target)g++ -c -o $@ $< $(flags)
+	$(target)g++ $(flags) -c -o $@ $<
 
 Output.o: Output.cpp Parser.hpp Pooling.hpp
-	$(target)g++ -c -o $@ $< $(flags)
+	$(target)g++ $(flags) -c -o $@ $<
 
-Library.o: Library.mm Cycript.tab.hh Parser.hpp Pooling.hpp Struct.hpp
-	$(target)g++ -c -o $@ $< $(flags)
+Library.o: Library.mm Cycript.tab.hh Parser.hpp Pooling.hpp Struct.hpp cycript.hpp
+	$(target)g++ $(flags) -c -o $@ $<
+
+Application.o: Application.cpp Cycript.tab.hh Parser.hpp Pooling.hpp cycript.hpp
+	$(target)g++ $(flags) -c -o $@ $<
 
 libcycript.dylib: ffi_type.o parse.o Output.o Cycript.tab.o lex.cy.o Library.o
-	$(target)g++ -I. -dynamiclib -mthumb -g3 -O0 -Wall -Werror -o $@ $(filter %.o,$^) -lobjc -framework CFNetwork -framework JavaScriptCore -framework WebCore -install_name /usr/lib/libcycript.dylib -framework CoreFoundation -framework Foundation -F${PKG_ROOT}/System/Library/PrivateFrameworks -L$(menes)/mobilesubstrate -lsubstrate -lapr-1 -lffi
+	$(target)g++ $(flags) -dynamiclib -o $@ $(filter %.o,$^) -lobjc -framework CFNetwork -framework JavaScriptCore -framework WebCore -install_name /usr/lib/libcycript.dylib -framework CoreFoundation -framework Foundation -L$(menes)/mobilesubstrate -lsubstrate -lapr-1 -lffi -framework UIKit
 	ldid -S $@
 
-cycript: Application.mm libcycript.dylib
-	$(target)g++ -g0 -O2 -Wall -Werror -o $@ $(filter %.mm,$^) -framework UIKit -framework Foundation -framework CoreFoundation -lobjc libcycript.dylib
+cycript: Application.o libcycript.dylib
+	$(target)g++ $(flags) -o $@ $(filter %.o,$^) -framework UIKit -framework Foundation -framework CoreFoundation -lobjc libcycript.dylib -lreadline -framework JavaScriptCore -lapr-1
 	ldid -S cycript
 
 package: all
@@ -81,6 +88,6 @@ package: all
 
 test: package
 	dpkg -i $(shell grep ^Package: control | cut -d ' ' -f 2-)_$(shell grep ^Version: control | cut -d ' ' -f 2)_iphoneos-arm.deb
-	cycript
+	cycript /Applications/HelloCycript.app/HelloCycript
 
 .PHONY: all clean extra package