X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=e3ac85847447371e1692d1faf904956bd800c619;hb=90ab89559ad6c425bbc074c09ed37b909f9d6057;hp=817d1988a5e24d2f77eb4d6952acb324dfe1973b;hpb=c5cb4ee434cc1bf69a792ee2316a697c8d74996b;p=org.ibex.core.git diff --git a/Makefile b/Makefile index 817d198..e3ac858 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ c_objects := $(c_sources:src/%.c=bin-$(platform)/%.c.o) gcc_path := $(shell pwd)/gcc/install #gcc_optimizations := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls -finline-functions #gcc_optimzations += -funroll-loops -ffunction-sections -fdata-sections -gcc_optimizations := -O0 +gcc_optimizations := -O2 debug := gcc_flags := $(gcc_optimizations) $(debug) -Isrc/org/ijg gcj_flags := -fCLASSPATH=bin @@ -52,11 +52,11 @@ PATH := jikes-1.18/bin:$(PATH) ## Platform-Neutral ########################################################################### ifneq ($(verbose),true) -.SILENT: $(cc_objects) $(java_objects) $(java_headers) all bin/org/xwt/builtin.xwar .bootclasspath .javac $(target_bin) compile +.SILENT: $(cc_objects) $(java_objects) $(java_headers) all bin/org/xwt/builtin.xwar $(target_bin) compile silent := --silent endif -compile: bin/org/xwt/builtin.xwar +compile: .javac .bootclasspath bin/org/xwt/builtin.xwar echo "compiling .java -> .class:" mkdir -p bin $(shell cat .javac) -classpath lib/libgcj-minimal.jar $(java_sources) -d bin/ 2>&1 | \ @@ -171,7 +171,7 @@ src/org/ijg/jmorecfg.h: src/org/ijg/jpegsrc.v6b.tar.gz src/org/ijg/jmorecfg.h.pa cd src/org/ijg/; tar xzf jpegsrc.v6b.tar.gz cd src/org/ijg/jpeg-6b; ./configure --target=$(target) cd src/org/ijg/jpeg-6b; mv $(jpeg_c_sources) $(jpeg_headers) .. - cd src/org/ijg; patch -p0 < jmorecfg.h.patch + cd src/org/ijg; patch -l -p0 < jmorecfg.h.patch rm -rf src/org/ijg/jpeg-6b $(cc_objects): bin-$(platform)/%.cc.o: src/%.cc $(java_headers) src/org/ijg/jmorecfg.h