X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=575cbb135c7166039c8ef0c38264773dfc69d364;hb=b8c64721391095b141b84a000e53326f05a45281;hp=11e25f3d487a4a3b13cccb00e48f6a3ddcd9cca0;hpb=ae27e30db87f36f6ebae16a502d2c23639b62d52;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index 11e25f3..575cbb1 100644
--- 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
@@ -49,18 +49,19 @@ jar                    := $(shell ((type fastjar &>/dev/null) && echo fastjar) |
 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/util/Preprocessor.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)) 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/MIPSApps.java: build/mips/mipsapps.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 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
@@ -112,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 $@`
@@ -146,7 +150,7 @@ build/$(platform)/$(platform).ar: $(java_objects) $(plat_java_sources:build/java
 	@echo -e "\n\033[1marchiving             .o -> .a\033[0m"
 	mkdir -p build/$(platform)
 	rm -f $@
-	upstream/install/$(target)/bin/ar rc $@ $?
+	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 
@@ -181,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"
@@ -332,4 +336,4 @@ dist-private:
 #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`