X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=1cca13e9ef8334bce81d4f47f5ade356f7c7bd06;hb=2ecea0c2856332ce907f16b4e2a233ff1428e4d6;hp=04e7e15fb894afb8e9c81a9e84ef8175dff11e20;hpb=4d9007ea179c900209a358278efa3528584b3532;p=org.ibex.core.git diff --git a/Makefile b/Makefile index 04e7e15..1cca13e 100644 --- a/Makefile +++ b/Makefile @@ -30,11 +30,11 @@ gcc_path := $(shell pwd)/gcc/install gcc_optimizations := -O2 debug := gcc_flags := $(gcc_optimizations) $(debug) -Isrc/org/ijg -gcj_flags := -fCLASSPATH=bin +gcj_flags := -fCLASSPATH=src gcj := $(gcc_path)/bin/$(target)-gcj $(gcj_flags) $(gcc_flags) g++ := $(gcc_path)/bin/$(target)-g++ $(gcc_flags) gcc := $(gcc_path)/bin/$(target)-gcc $(gcc_flags) -gcjh := $(gcc_path)/bin/gcjh +gcjh := $(gcc_path)/bin/$(target)-gcjh as := $(gcc_path)/$(target)/bin/as ar := $(gcc_path)/$(target)/bin/ar @@ -161,9 +161,6 @@ $(java_headers): bin/%.h: bin/%.class sed s_/_._g | sed s/.class$$// | sed s/.java$$// |\ xargs $(gcjh) --classpath . -bin-$(platform)/org/xwt/js/CompiledFunctionImpl.java.o: src/org/xwt/js/CompiledFunctionImpl.java - $(gcj) -c bin/org/xwt/js/CompiledFunctionImpl*.class -o $@ - $(java_objects): bin-$(platform)/%.java.o: src/%.java @echo "compiling .java -> .o: $<" mkdir -p `dirname $@`