From 36b17515a42e468be7db1346384ce98df3e30882 Mon Sep 17 00:00:00 2001 From: megacz Date: Fri, 30 Jan 2004 08:04:09 +0000 Subject: [PATCH] 2004/01/19 01:38:19 darcs-hash:20040130080409-2ba56-d94990c805602cf2aecbb1215ff19a1a3d7cb336.gz --- Makefile | 27 +++++++++++++-------------- Makefile.upstream | 7 +++++-- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 3334950..cf38732 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,12 @@ # +target_Darwin := powerpc-apple-darwin +target_Win32 := i686-pc-mingw32 +target_Solaris := sparc-sun-solaris2.7 +target_Linux := i686-pc-linux-gnu +target := $(target_$(platform)) + all: JVM Linux Win32 Darwin Solaris clean: ; rm -rf build @@ -18,9 +24,6 @@ Solaris: ; make gcj platform=Solaris link_flags="-lX11 -lXext -lpthread" Win32: ; make gcj platform=Win32 link_flags="-Wl,--subsystem,windows -lcomdlg32" Darwin: ; make gcj platform=Darwin link_flags="$(darwin_linker_flags)" -# default -platform := JVM - darwin_libdir := upstream/install/powerpc-apple-darwin/lib darwin_linker_flags := -Wl,-dylib_file,/usr/lib/libSystem.B.dylib:$(darwin_libdir)/libSystem.B.dylib darwin_linker_flags += -Wl,-dylib_file,/usr/lib/system/libmathCommon.A.dylib:$(darwin_libdir)/libmathCommon.A.dylib @@ -29,18 +32,20 @@ darwin_linker_flags += -Wl,-dylib_file,$(darwin_ogl_libdir)/libGL.dylib:$(darwin darwin_linker_flags += -Wl,-dylib_file,$(darwin_ogl_libdir):$(darwin_libdir)/libGLU.dylib darwin_linker_flags += -lSystem.B -lmathCommon.A -lGL -lGLU -target_bin_extension_$(platform) := (shell echo $(platform) | tr A-Z a-z) +target_bin_extension_$(platform) := $(shell echo $(platform) | tr A-Z a-z) target_bin_extension_Win32 := exe target_bin_extension_JVM := jar -target_bin_extension := target_bin_extension_$(target) +target_bin_extension := $(target_bin_extension_$(platform)) target_bin := xwt.$(target_bin_extension) -jikes_flags := -nowarn -sourcepath src/ +jikes_flags := -nowarn gcc_optimizations := -O2 #gcc_optimizations := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls #gcc_optimizations += -finline-functions -funroll-loops -ffunction-sections -fdata-sections -gcc_flags := -nostdinc $(gcc_optimizations) -Ibuild/h -Iupstream/jpeg-6b/src/ -Iupstream/jpeg-6b/build-$(target)/ +gcc_flags := -nostdinc $(gcc_optimizations) -Ibuild/h -Iupstream/jpeg-6b/src/ -Iupstream/jpeg-6b/build-$(target) +gcc_flags += -Iupstream/install/$(target)/include -Iupstream/install/lib/gcc-lib/$(target)/3.3/include +gcc_flags += -Iupstream/install/include gcj_flags := -fCLASSPATH=build/java g++_flags := -Iupstream/install/lib/gcc-lib/$(target)/3.3/include/ -Iupstream/install/$(target)/include -Wno-multichar gcj := upstream/install/bin/$(target)-gcj $(gcc_flags) $(gcj_flags) @@ -49,12 +54,6 @@ g++ := upstream/install/bin/$(target)-gcj $(gcc_flags) gcc := upstream/install/bin/$(target)-gcc $(gcc_flags) $(g++_flags) jar := $(shell ((type fastjar &>/dev/null) && echo fastjar) || echo jar) -target_Darwin := powerpc-apple-darwin -target_Win32 := i686-pc-mingw32 -target_Solaris := sparc-sun-solaris2.7 -target_Linux := i686-pc-linux-gnu -target := $(target_$(platform)) - gcj: .install_gcc-3.3_$(target); make $(target_bin) link_flags="$(link_flags)" platform=$(platform) include Makefile.upstream @@ -89,7 +88,7 @@ build/class/org/xwt/util/Preprocessor.class: src/org/xwt/util/Preprocessor.java oldcompile:; CLASSPATH=$$CLASSPATH:lib/libgcj-minimal.jar:upstream/mips/build javac -d build/class `find build/java/ -name \*.java` compile: .compile -.compile: $(java_sources) .jikes +.compile: $(java_sources) .jikes .install_mips2java @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 diff --git a/Makefile.upstream b/Makefile.upstream index d9f4d12..e170b21 100644 --- a/Makefile.upstream +++ b/Makefile.upstream @@ -154,11 +154,14 @@ endif .install_binutils-2.13.2.1_mips-unknown-elf: .install_mips2java; touch $@ .install_gcc-3.3_mips-unknown-elf: .install_mips2java; touch $@ -.install_mips2java: + +.download_mips2java: mkdir -p upstream/install echo '/1 :pserver:cvs@cvs.xwt.org:2401/ A' >> ~/.cvspass cd upstream; cvs -d :pserver:cvs@cvs.xwt.org:/ co mips cd upstream/mips/upstream; ln -sf `cd ../..; pwd`/install + +.install_mips2java: .download_mips2java (cd upstream/mips; make) touch $@ @@ -194,7 +197,7 @@ endif .jikes: @echo -e "\n\033[1mdetecting your jikes installation...\033[0m" echo "#!/bin/sh" > .jikes - echo -n 'PATH=upstream/install/bin:$$PATH jikes -classpath lib/libgcj-minimal.jar:build/class:upstream/mips/build $$@ -d build/class/ -sourcepath build/java/ ' >> .jikes + echo -n 'PATH=upstream/install/bin:$$PATH jikes -classpath lib/libgcj-minimal.jar:build/class $$@ -d build/class/ -sourcepath build/java/:upstream/mips:upstream/mips/build:src ' >> .jikes (type jikes && (jikes --version | grep "Version 1.18")) || make .install_jikes-1.18_ target= echo -n "$(jikes_flags) -bootclasspath " >> .jikes echo "public class GetBootClassPath { public static void main(String[] s) { " > GetBootClassPath.java -- 1.7.10.4