X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=075a471d61feb1cc550fab8b11a5fc4e7f3dcda2;hb=9b9ac0a0bac4f70cfcc2af30babd4598627490c0;hp=8ea3360de0f4945769a803f2677fcf8127d3603b;hpb=bcbd0590fb700778ce02717ae1676859254e284d;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index 8ea3360..075a471 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 
 #
 
-all:      JVM Linux Win32 Darwin #Solaris
+all:      JVM Linux Win32 Darwin Solaris
 
 clean:
 	rm -rf build
@@ -15,7 +15,7 @@ dist-clean:
 
 JVM:        build/JVM/xwt.jar
 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"
+Solaris:  ; make gcj platform=Solaris target=sparc-sun-solaris2.7 link_flags="-lX11 -lXext -static-libgcc -lpthread"
 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)"
 
@@ -114,9 +114,9 @@ build/h/%.h: build/class/%.class
 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"
+	@echo -e "\n\033[1mcompiling         .class -> .o:     $<\033[0m"
 	mkdir -p `dirname $@`
-	$(gcj) -c $< -o $@
+	$(gcj) -Os -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
@@ -212,19 +212,18 @@ build/mips/%.c.o: src/%.c .download_libmspack-20030726
 		-Iupstream/libmspack-20030726/src/mspack \
 		-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 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
 	make .install_libmspack-20030726_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 \
-		-Lupstream//libmspack-20030726/build-mips-unknown-elf/ \
+		-T upstream/mips/org/xwt/mips/linker.ld \
+		-L upstream/mips/build/org/xwt/mips/ \
+		-L upstream/freetype-2.1.4/src/objs \
+		-L upstream/libmspack-20030726/build-mips-unknown-elf/ \
 		-o $@ \
 		$^ \
 		-lfreetype \