2004/01/14 09:46:41

[org.ibex.core.git] / Makefile

diff --git a/Makefile b/Makefile
index 6641501..575cbb1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,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"
-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
@@ -61,7 +61,7 @@ build/java/org/xwt/translators/MIPSApps.java: build/mips/mipsapps.mips
        @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 MIPSApps build/mips/mipsapps.mips)\
-        | sed 's,//.*$$,,;'|tr -d '\n' > $@
+        | sed 's,//.*$$,,;'|tr -d '\n'  > $@
 
 build/java/org/xwt/%.java: src/org/xwt/%.java
        make build/class/org/xwt/util/Preprocessor.class
@@ -113,9 +113,12 @@ build/h/%.h: build/class/%.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 $@`
@@ -182,7 +185,7 @@ build/$(platform)/builtin.o: build/res/builtin.jar
 
 # compile is here to force compilation of the .class files (they get used via -Ibuild) without
 # having the individual .o's depend on the .java's (otherwise every .o gets recompiled when one .java changes)
-gcj: .vendor .compile .install_gcc-3.3_$(target) $(target_bin)
+gcj: .vendor .compile .install_gcc-3.3.2_$(target) $(target_bin)
 
 build/JVM/xwt.jar: .compile build/res/builtin.jar
        @echo -e "\n\033[1marchiving         .class -> .jar:   build/JVM/xwt.jar\033[0m"