freetype fixes

[org.ibex.core.git] / Makefile

diff --git a/Makefile b/Makefile
index a67c9e5..e8f2eb2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -104,11 +104,8 @@ java_sources              += build/java/org/xwt/mips/util/SeekableByteArray.java
 java_sources              += build/java/org/xwt/mips/util/SeekableData.java
 java_sources              += build/java/org/xwt/mips/util/SeekableFile.java
 java_sources              += build/java/org/xwt/mips/util/SeekableInputStream.java
-java_sources              += build/java/org/xwt/mips/ClassFileCompiler.java
-java_sources              += build/java/org/xwt/mips/ELF.java
 java_sources              += build/java/org/xwt/mips/Registers.java
 java_sources              += build/java/org/xwt/mips/Runtime.java
-java_sources              += build/java/org/xwt/mips/UnixRuntime.java
 java_sources              += build/java/org/xwt/mips/UsermodeConstants.java
 
 java_classes              := $(java_sources:build/java/%.java=build/class/%.class)
@@ -152,7 +149,7 @@ build/class/org/ibex/util/MIPSApps.class: build/mips/mipsapps.mips .install_nest
        mkdir -p build/java/org/ibex/util
        @echo -e "\n\033[1mtranslating        .mips -> .class:  $<\033[0m"
        java -cp upstream/nestedvm/build:upstream/nestedvm/upstream/build/bcel-5.1/bcel-5.1.jar \
-               org.xwt.mips.Compiler org.ibex.translators.MIPSApps $< -outfile $@
+               org.xwt.mips.Compiler org.ibex.util.MIPSApps $< -outfile $@
 #-o onepage,pagesize=8m
 
 compile: .compile
@@ -328,8 +325,8 @@ build/mips/mipsapps.mips: build/mips/org/ibex/graphics/Freetype.c.o build/mips/o
        upstream/install/bin/mips-unknown-elf-gcc \
                --static \
                -march=mips1 \
-               -T upstream/mips/org/xwt/mips/linker.ld \
-               -L upstream/mips/build/org/xwt/mips/ \
+               -T upstream/nestedvm/src/org/xwt/mips/linker.ld \
+               -L upstream/nestedvm/build/org/xwt/mips/ \
                -L upstream/freetype-2.1.4/src/objs \
                -L upstream/libmspack-20030726/build-mips-unknown-elf/ \
                -o $@ \