X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=f5a6522a09e604312eaf4848e70b6dd331843d5e;hb=4a3be9eff6a5201f4fd7228fc8413a8bd36ddd7c;hp=444515b3c55c8230d1511fbad874f9e4d16c2dbd;hpb=b931f17d5d374832498c47ac1bcde0ba15dec0ef;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index 444515b..f5a6522 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ jikes_flags            := -verbose -nowarn -sourcepath src/
 gcc_path               := upstream/install
 gcc_optimizations      := -O2
 #gcc_optimizations      := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls -finline-functions -funroll-loops -ffunction-sections -fdata-sections
-gcc_flags              := $(gcc_optimizations) -Ibuild/h
+gcc_flags              := $(gcc_optimizations) -Ibuild/h -Iupstream/jpeg-6b/src/
 gcj_flags              += -fCLASSPATH=build/java
 gcj                    := $(gcc_path)/bin/$(target)-gcj $(gcc_flags) $(gcj_flags)
 g++                    := $(gcc_path)/bin/$(target)-g++ $(gcc_flags)
@@ -58,7 +58,7 @@ upstream/.jikes:
 	make -sC upstream .jikes
 
 $(gcc_path)/bin/$(target)-gcj:
-	make -sC upstream gcc-3.3.1-$(target)
+	make -sC upstream gcc-3.3-$(target)
 
 
 # PHASE 1b: human-written inputs
@@ -75,7 +75,7 @@ java_sources    := $(handwritten_java_sources:src/%.java=build/java/%.java)
 java_sources    += $(handwritten_java_pp_sources:src/%.java.pp=build/java/%.java)
 java_sources    += $(handwritten_mips_sources:src/%.mips.c=build/java/%.java)
 java_sources    += build/java/org/xwt/Builtin.java
-java_sources    += build/java/org/xwt/imp/Freetype.java
+#java_sources    += build/java/org/xwt/imp/Freetype.java
 $(handwritten_java_sources:src/%.java=build/java/%.java): build/java/%.java: src/%.java
 	@echo "symlinking:                         $@"
 	@mkdir -p `dirname $@`;  \
@@ -164,7 +164,7 @@ build/java/org/xwt/imp/Freetype.java:: build/mips/freetype.mips build/class/org/
 build/mips/freetype.mips: $(freetype_mips_objects)
 	@echo "compiling             .c -> .mips:  $@"
 	@mkdir -p build/mips
-	@make -sC upstream newlib-1.11.0/src newlib-1.11.0/build-mips/.installed gcc-3.3.1-mips freetype-2.1.4/src .headers target=mips
+	@make -sC upstream newlib-1.11.0/src newlib-1.11.0/build-mips/.installed gcc-3.3-mips freetype-2.1.4/src .headers target=mips
 	@$(gcc_path)/bin/mips-gcc \
 		--static \
 		-mabi=32 \