all: JVM Linux Win32 Darwin #Solaris
clean:
+ rm -rf build
+
+dist-clean:
rm -rf .jikes .configure* .install* build .compile .build*
find upstream -name config.cache -exec rm {} \;
JVM: build/JVM/xwt.jar
-Linux: ; make gcj platform=Linux target=i686-pc-linux-gnu link_flags="-lX11 -lXext --static"
+Linux: ; make gcj platform=Linux target=i686-pc-linux-gnu link_flags="-lX11 -lXext"
Solaris: ; make gcj platform=Solaris target=sparc-sun-solaris2.7 link_flags="-lX11 -lXext"
-Win32: ; make gcj platform=Win32 target=i686-pc-mingw32 link_flags="-Wl,--subsystem,windows -lcomdlg32" target_bin=xwt.exe
+Win32: ; make gcj platform=Win32 target=i686-pc-mingw32 link_flags="-Wl,--subsystem,console -lcomdlg32" target_bin=xwt.exe
Darwin: ; make gcj platform=Darwin target=powerpc-apple-darwin link_flags="$(darwin_linker_flags)"
# default
include Makefile.upstream
# figure out what stuff in org.xwt.plat.* this platform requires (its superclasses)
-java_sources := $(patsubst src/%.java, build/java/%.java, $(shell find src -name '*.java' \! -path 'src/org/xwt/mips/*'))
-java_sources += build/java/org/xwt/translators/FreetypeVM.java
+java_sources := $(patsubst src/%.java, build/java/%.java, $(shell find src -name '*.java' | grep -v Preprocessor))
all_java_sources := $(java_sources)
-nonplat_java_sources := $(filter-out build/java/org/xwt/plat/%, $(java_sources))
+nonplat_java_sources := $(filter-out build/java/org/xwt/plat/%, $(java_sources)) build/java/org/xwt/translators/Freetype.java build/java/org/xwt/translators/MSPack.java build/java/org/xwt/translators/MIPSApps.java
plat_java_sources := $(filter build/java/org/xwt/plat/%, $(java_sources))
-build/java/org/xwt/translators/FreetypeVM.java: build/res/freetype.mips build/class/org/xwt/mips/Compiler.class
+build/java/org/xwt/translators/MIPSApps.java: build/mips/mipsapps.mips
+ make build/class/org/xwt/mips/Compiler.class
mkdir -p build/java/org/xwt/translators
+ @echo -e "\n\033[1mtranslating .mips -> .java: $<\033[0m"
(echo -e 'package org.xwt.translators;\nimport org.xwt.mips.*;\n'; \
- java -Xint -cp build/class org.xwt.mips.Compiler FreetypeVM build/res/freetype.mips)\
- > $@
+ java -Xint -cp build/class org.xwt.mips.Compiler MIPSApps build/mips/mipsapps.mips)\
+ | sed 's,//.*$$,,;'|tr -d '\n' > $@
build/java/org/xwt/%.java: src/org/xwt/%.java
make build/class/org/xwt/util/Preprocessor.class
@echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
build/res/%: src/% ; @echo linking $@; mkdir -p $(@D); ln -fs `echo $(@D)/ | sed 's_[^/]*//*_../_g'`/$< $@
+build/class/org/xwt/translators/MIPSApps.class: build/java/org/xwt/translators/MIPSApps.java .jikes
+ @echo -e "\n\033[1mcompiling .java -> .class: $<\033[0m"
+ mkdir -p build/class/org/xwt/translators
+ ./.jikes -g:none $<
+
build/class/org/xwt/util/Preprocessor.class: src/org/xwt/util/Preprocessor.java .jikes
@echo -e "\n\033[1mcompiling .java -> .class: $<\033[0m"
mkdir -p build/class/org/xwt/util/
# this forces a clean build every time because jikes is so damn buggy
preprocess: $(java_sources)
compile: .compile
-.compile: $(java_sources) .jikes
+.compile: build/class/org/xwt/translators/MIPSApps.class $(java_sources) .jikes
@echo -e "\n\033[1mcompiling .java -> .class: src/**/*.java\033[0m"
@rm -f $(java_sources:build/java/%.java=build/class/%.class)
mkdir -p build/class
# a hack since we've disabled gcj's awt implementation
build/$(platform)/org/xwt/plat/Java2.java.o:
touch .empty.c; mkdir -p $(@D); $(gcc) -c .empty.c -o $@;
+build/$(platform)/org/xwt/translators/MIPSApps.java.o: build/class/org/xwt/translators/MIPSApps.class
+ @echo -e "\n\033[1mcompiling .java -> .o: $<\033[0m"
+ mkdir -p `dirname $@`
+ $(gcj) -c $< -o $@
build/$(platform)/org/xwt/plat/AWT.java.o:
touch .empty.c; mkdir -p $(@D); $(gcc) -c .empty.c -o $@;
-
build/$(platform)/%.java.o: build/java/%.java
@echo -e "\n\033[1mcompiling .java -> .o: $<\033[0m"
mkdir -p `dirname $@`
build/$(platform)/$(platform).ar: $(java_objects) $(plat_java_sources:build/java/%.java=build/$(platform)/%.java.o)
@echo -e "\n\033[1marchiving .o -> .a\033[0m"
mkdir -p build/$(platform)
- upstream/install/$(target)/bin/ar rc $@ $?
+ rm -f $@
+ upstream/install/$(target)/bin/ar rc $@ $^
upstream/install/$(target)/bin/ranlib $@
$(target_bin): build/$(platform)/org/xwt/plat/$(platform).cc.o upstream/jpeg-6b/build-$(target)/libjpeg.a build/$(platform)/builtin.o build/$(platform)/$(platform).ar
cd build/res/fonts/vera; ln -s ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/Vera.ttf
cd build/res/fonts/vera; ln -s ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/VeraMono.ttf
cd build/res/fonts/vera; ln -s ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/VeraSe.ttf
-build/res/builtin.jar: $(builtin_src:src/%=build/res/%) build/res/freetype.mips build/res/libmspack.mips build/res/fonts/vera
+build/res/builtin.jar: $(builtin_src:src/%=build/res/%) build/res/fonts/vera
@echo -e "\n\033[1mzipping res/* -> .jar: builtin.jar\033[0m"
cd build/res; $(jar) cf builtin.jar $(^:build/res/%=%)
mkdir -p build/JVM
echo -e "Manifest-Version: 1.0\nMain-Class: org.xwt.Main\n" > build/JVM/.manifest
cd build/class/org/xwt; ln -sf ../../../res/builtin.jar
- cd build/class; $(jar) cfm ../JVM/xwt.jar ../JVM/.manifest `find . \! -type d`;
+ cd build/class; $(jar) cfm ../JVM/xwt.jar ../JVM/.manifest \
+ `find . \! -type d \! -path './org/xwt/mips/*'` \
+ $(patsubst %,org/xwt/mips/%*.class, Runtime Registers Syscalls Errno)
# Freetype
#
-build/mips/%.c.o: src/%.c
+build/mips/%.c.o: src/%.c .download_libmspack-20030726
make .install_freetype-2.1.4_mips-unknown-elf target=mips-unknown-elf
+ make .install_libmspack-20030726_mips-unknown-elf target=mips-unknown-elf
mkdir -p $(@D)
echo -e "\n\033[1mcompiling $< -> $@ (mips)\033[0m"
upstream/install/bin/mips-unknown-elf-gcc -march=r3000 \
-Iupstream/libmspack-20030726/src/mspack \
-c -o $@ $<
-build/res/freetype.mips: build/mips/org/xwt/translators/Freetype.c.o build/mips/org/xwt/mips/crt0.c.o build/mips/org/xwt/mips/syscalls.c.o
+build/mips/mipsapps.mips: build/mips/org/xwt/translators/Freetype.c.o build/mips/org/xwt/translators/MSPack.c.o build/mips/org/xwt/translators/main.c.o
make .install_freetype-2.1.4_mips-unknown-elf target=mips-unknown-elf
- @echo -e "\n\033[1mlinking .o -> .mips: $@\033[0m"
- mkdir -p build/mips build/res
- upstream/install/bin/mips-unknown-elf-gcc \
- -nostdlib \
- --static \
- -march=mips1 \
- -T src/org/xwt/mips/linker.ld \
- -Lbuild/mips \
- -Lupstream/freetype-2.1.4/src/objs \
- -o $@ \
- $^ \
- -lfreetype
-
-.install_libmspack-20030726_mips-unknown-elf:
make .install_libmspack-20030726_mips-unknown-elf target=mips-unknown-elf
-build/mips/org/xwt/translators/MSPack.c.o: .install_libmspack-20030726
-build/res/libmspack.mips: build/mips/org/xwt/translators/MSPack.c.o build/mips/org/xwt/mips/crt0.c.o build/mips/org/xwt/mips/syscalls.c.o
@echo -e "\n\033[1mlinking .o -> .mips: $@\033[0m"
mkdir -p build/mips build/res
upstream/install/bin/mips-unknown-elf-gcc \
-nostdlib \
--static \
-march=mips1 \
- -T src/org/xwt/mips/linker.ld \
- -Lbuild/mips \
- -Lupstream/libmspack-20030726/src/mspack \
- -Lupstream/libmspack-20030726/build-mips-unknown-elf \
+ -T upstream/mips/org/xwt/mips/linker.ld \
+ -L upstream/mips/build/org/xwt/mips/ \
+ -L upstream/mips/build/ \
+ -L upstream/freetype-2.1.4/src/objs \
+ -L upstream/libmspack-20030726/build-mips-unknown-elf/ \
-o $@ \
$^ \
- -lmspack
-
+ -lfreetype \
+ -lmspack \
+ -Wl,--gc-sections
##############################################################################
# Maintainer stuff: generating numbered builds, proposing patches
#test: JVM; /System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Commands/java -jar build/JVM/xwt.jar http://localhost/demo.xwar
test: JVM; java -jar build/JVM/xwt.jar http://localhost/demo.xwar
-oldcompile: preprocess; CLASSPATH=$$CLASSPATH:lib/libgcj-minimal.jar javac -d build/class `find build/java/ src/org/xwt/mips -name \*.java`
+oldcompile: preprocess; CLASSPATH=$$CLASSPATH:lib/libgcj-minimal.jar javac -d build/class `find build/java/ -name \*.java`
projects / org.ibex.core.git / blobdiff