From: megacz Date: Fri, 30 Jan 2004 07:35:42 +0000 (+0000) Subject: 2003/09/17 07:12:23 X-Git-Tag: RC3~609 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=7431226f404a5517a4b68548284872336b0e5249;p=org.ibex.core.git 2003/09/17 07:12:23 darcs-hash:20040130073542-2ba56-c8152c5445819c2c4988e5dbdb64e2e1c327f40e.gz --- diff --git a/Makefile b/Makefile index b356a6e..ed4c7ab 100644 --- a/Makefile +++ b/Makefile @@ -92,7 +92,10 @@ build/$(platform)/%.java.o: build/java/%.java mkdir -p `dirname $@` $(gcj) -c $< -o $@ -build/$(platform)/org/xwt/plat/$(platform).cc.o: src/org/xwt/plat/$(platform).cc src/org/xwt/plat/*.cc $(java_headers) .configure_jpeg-6b_$(target) +headers: $(java_headers) + +build/$(platform)/org/xwt/plat/$(platform).cc.o: src/org/xwt/plat/$(platform).cc src/org/xwt/plat/*.cc .configure_jpeg-6b_$(target) + @make headers @echo -e "\n\033[1mcompiling .cc -> .o: $<\033[0m" mkdir -p `dirname $@` $(g++) -Iupstream/install/lib/gcc-lib/$(target)/3.3/include/ -Iupstream/install/$(target)/include -I/usr/X11R6/include/ -Ibuild/h -Wno-multichar -Iupstream/install/include -c $< -o $@ @@ -109,13 +112,13 @@ jpeg_sources += jdhuff.c jdphuff.c jddctmgr.c jidctint.c jidctfst.c jidctflt. jpeg_sources += jquant1.c jquant2.c jerror.c jutils.c jmemnobs.c jmemmgr.c upstream/jpeg-6b/build-$(target)/libjpeg.a: .install_jpeg-6b_$(target) -java_objects := $(java_sources:build/java/%.java=build/$(platform)/%.java.o) +java_objects := $(nonplat_java_sources:build/java/%.java=build/$(platform)/%.java.o) $(target_bin): $(java_objects) upstream/jpeg-6b/build-$(target)/libjpeg.a build/$(platform)/org/xwt/plat/$(platform).cc.o build/$(platform)/org/xwt/builtin.res.o build/$(platform)/freetype.res.o @echo -e "\n\033[1mlinking .o -> $(target_bin)\033[0m" mkdir -p build/$(platform) upstream/install/bin/$(target)-ar rcs $(platform).ar $(plat_java_sources:build/java/%.java=build/$(platform)/%.java.o) - PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.xwt.Main -o build/$(platform)/$(target_bin) $^ $(jpeg_sources:%.c=upstream/jpeg-6b/build-$(target)/%.o) -Lupstream/install/$(target)/lib $(link_flags) build/$(platform)/org/xwt/plat/$(platform).java.o $(platform).ar + PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.xwt.Main -o build/$(platform)/$(target_bin) $^ $(jpeg_sources:%.c=upstream/jpeg-6b/build-$(target)/%.o) -Lupstream/install/$(target)/lib $(link_flags) $(platform).ar build/$(platform)/org/xwt/plat/$(platform).java.o ############################################################################## diff --git a/Makefile.upstream b/Makefile.upstream index e622893..db96730 100644 --- a/Makefile.upstream +++ b/Makefile.upstream @@ -19,9 +19,11 @@ url_jikes-1.18 := http://www.megacz.com/tmp/jikes-1.18.tgz #ftp:// .install_binutils-2.13.2.1_powerpc-apple-darwin: .vendor rm -rf upstream/darwin-linker/src cd upstream/darwin-linker; tar xvzf ../install/powerpc-apple-darwin/cctools-478.tgz +ifneq ($(shell uname),Darwin) cd upstream/darwin-linker/src/cctools; for A in ../../patches/*.patch; do patch -p0 < $$A; done cp upstream/darwin-linker/src/cctools/ld/fake-mach.c upstream/darwin-linker/src/cctools/libstuff cd upstream/darwin-linker/src/; mkdir macosx-include; cd macosx-include; ../../links.sh +endif make -C upstream/darwin-linker/src/cctools/libstuff make -C upstream/darwin-linker/src/cctools/misc touch upstream/darwin-linker/src/cctools/misc/makeUser.c upstream/darwin-linker/src/cctools/misc/make.h @@ -46,7 +48,7 @@ url_jikes-1.18 := http://www.megacz.com/tmp/jikes-1.18.tgz #ftp:// cd upstream/install/bin; ln -sf ../powerpc-apple-darwin/bin/ranlib powerpc-apple-darwin-ranlib cd upstream/install/bin; ln -sf ../powerpc-apple-darwin/bin/strip powerpc-apple-darwin-strip echo -e "#!/bin/sh\nc++filt \$$@\n" > upstream/install/bin/c++filt3; chmod +x upstream/install/bin/c++filt3 - cd upstream/install/powerpc-apple-darwin/bin; ln -s ../../bin/c++filt3 + cd upstream/install/powerpc-apple-darwin/bin; ln -sf ../../bin/c++filt3 touch $@ # building gcc requires binutils @@ -56,27 +58,30 @@ url_jikes-1.18 := http://www.megacz.com/tmp/jikes-1.18.tgz #ftp:// .configure_newlib-1.11.0_$(target): .install_gcc-3.3_$(target) # how to configure it -configure_gcc-3.3 := --enable-languages=c,c++,java --enable-gc-type=boehm --disable-shared --disable-jvmpi -configure_gcc-3.3-powerpc-apple-darwin := --enable-threads=posix --disable-hash-synchronization --disable-multilib +configure_gcc-3.3 += --enable-languages=c,c++,java --enable-gc-type=boehm +configure_gcc-3.3 += --disable-shared --disable-jvmpi configure_gcc-3.3 += --disable-java-awt --disable-interpreter --enable-static --enable-libgcj ifneq ($(shell uname),$(platform)) configure_gcc-3.3 += --with-gnu-ld=$(shell pwd)/upstream/install/bin/$(target)-ld configure_gcc-3.3 += --with-as=$(shell pwd)/upstream/install/bin/$(target)-as -configure_gcc-3.3-powerpc-apple-darwin += --with-headers=$(shell pwd)/upstream/install/$(target)/include +configure_gcc-3.3_powerpc-apple-darwin += --with-headers=$(shell pwd)/upstream/install/$(target)/include endif -configure_gcc-3.3-i686-pc-mingw32 += --with-headers=$(shell pwd)/upstream/install/$(target)/include -configure_gcc-3.3-i686-pc-mingw32 := --enable-threads=win32 --enable-hash-synchronization -configure_gcc-3.3-i686-pc-linux-gnu := --enable-threads=posix --enable-hash-synchronization -configure_gcc-3.3-sparc-sun-solaris2.7 := --enable-threads=posix --disable-multilib -configure_gcc-3.3-mips-unknown-elf := --enable-languages=c --nfp --enable-multilib --disable-threads +configure_gcc-3.3_powerpc-apple-darwin += --enable-threads=posix --disable-hash-synchronization --disable-multilib +configure_gcc-3.3_i686-pc-mingw32 += --with-headers=$(shell pwd)/upstream/install/$(target)/include +configure_gcc-3.3_i686-pc-mingw32 += --enable-threads=win32 --enable-hash-synchronization +configure_gcc-3.3_i686-pc-linux-gnu += --enable-threads=posix --enable-hash-synchronization +configure_gcc-3.3_sparc-sun-solaris2.7 += --enable-threads=posix --disable-multilib +configure_gcc-3.3_mips-unknown-elf += --with-gnu-ld=$(shell pwd)/upstream/install/bin/$(target)-ld +configure_gcc-3.3_mips-unknown-elf += --with-as=$(shell pwd)/upstream/install/bin/$(target)-as +configure_gcc-3.3_mips-unknown-elf += --enable-languages=c --nfp --enable-multilib --disable-threads # libjpeg's configury doesn't obey --target -environment_jpeg-6b_$(target) := PATH=$(shell pwd)/upstream/install/$(target)/bin:$$PATH +environment_jpeg-6b_$(target) += PATH=$(shell pwd)/upstream/install/$(target)/bin:$$PATH environment_jpeg-6b_$(target) += CC=$(shell pwd)/upstream/install/bin/$(target)-gcc environment_jpeg-6b_$(target) += AR="$(shell pwd)/upstream/install/$(target)/bin/ar rc" environment_jpeg-6b_$(target) += AR2=$(shell pwd)/upstream/install/$(target)/bin/ranlib -environment_gcc_3.3_$(target) := PATH=$(shell pwd)/upstream/install/bin:$$PATH +environment_gcc_3.3_$(target) += PATH=$(shell pwd)/upstream/install/bin:$$PATH .PRECIOUS: .vendor .download_% .configure_%_$(target) .install_%_$(target) @@ -107,7 +112,7 @@ vendor: .vendor; @true --target=$(target) \ --prefix=`cd ../..; pwd`/install \ $(configure_$*) \ - $(configure_$*-$(target)) + $(configure_$*_$(target)) touch $@ .install_freetype-2.1.4_mips-unknown-elf: .install_gcc-3.3_mips-unknown-elf .install_newlib-1.11.0_mips-unknown-elf .download_freetype-2.1.4 diff --git a/src/org/xwt/Box.java.pp b/src/org/xwt/Box.java.pp index b5b8d58..2c60161 100644 --- a/src/org/xwt/Box.java.pp +++ b/src/org/xwt/Box.java.pp @@ -20,6 +20,7 @@ import java.net.*; import java.util.*; import org.xwt.js.*; import org.xwt.util.*; +import org.xwt.imp.*; /** *