From: adam Date: Thu, 12 Feb 2004 03:44:35 +0000 (+0000) Subject: misc native build fixups X-Git-Tag: RC3~44 X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=commitdiff_plain;h=07f137d5694c7d52a6a2c28e051546232b353f5d misc native build fixups darcs-hash:20040212034435-5007d-9a194514d15c296716918551e25c7a02c7354dd7.gz --- diff --git a/Makefile b/Makefile index 77ff333..94bf96a 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ dist-clean: JVM: build/JVM/ibex.jar Linux: ; make gcj platform=Linux link_flags="upstream/install/lib/libExtraWINGs.a upstream/install/lib/libWINGs.a upstream/install/lib/libwraster.a -L/usr/X11R6/lib -lXpm -lX11 -lXext" -Solaris: ; make gcj platform=Solaris link_flags="-lX11 -lXext -lpthread" +Solaris: ; make gcj platform=Solaris link_flags="-Lupstream/install/sparc-sun-solaris2.7/lib/ upstream/install/sparc-sun-solaris2.7/lib/libExtraWINGs.a upstream/install/sparc-sun-solaris2.7/lib/libWINGs.a upstream/install/sparc-sun-solaris2.7/lib/libwraster.a -lXpm -lX11 -lXext -lpthread" Win32: ; make gcj platform=Win32 link_flags="-Wl,--subsystem,windows -lcomdlg32" Darwin: ; make gcj platform=Darwin link_flags="$(darwin_linker_flags)" @@ -167,7 +167,10 @@ build/$(platform)/%.java.o: build/java/%.java mkdir -p `dirname $@` $(gcj) -c $< -o $@ -build/$(platform)/org/ibex/plat/X11.cc.o: .install_WindowMaker-0.80.2_$(target) +# FIXME detect subclasses of X11 +build/$(platform)/org/ibex/plat/Linux.cc.o: .install_WindowMaker-0.80.2_$(target) +build/$(platform)/org/ibex/plat/Solaris.cc.o: .install_WindowMaker-0.80.2_$(target) + build/$(platform)/org/ibex/plat/$(platform).cc.o: src/org/ibex/plat/$(platform).cc src/org/ibex/plat/*.cc .configure_jpeg-6b_$(target) @make $(java_headers) @echo -e "\n\033[1mcompiling .cc -> .o: $<\033[0m" diff --git a/Makefile.upstream b/Makefile.upstream index 2d2719b..5fc5417 100644 --- a/Makefile.upstream +++ b/Makefile.upstream @@ -18,7 +18,7 @@ url_libmspack-20030726 := http://www.kyz.uklinux.net/downloads/libmspack-2003072 url_vera-1.10 := http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.gz url_jode-1.1.1 := http://umn.dl.sourceforge.net/sourceforge/jode/jode-1.1.1.tar.gz url_java-getopt-1.0.9 := ftp://ftp.urbanophile.com/pub/arenn/software/sources/java-getopt-1.0.9.tar.gz -url_WindowMaker-0.80.2 := ftp://windowmaker.org/pub/source/release/WindowMaker-0.80.2.tar.gz +url_WindowMaker-0.80.2 := http://windowmaker.org/pub/source/release/WindowMaker-0.80.2.tar.gz .install_binutils-2.13.2.1_powerpc-apple-darwin: .vendor rm -rf upstream/darwin-linker/src @@ -75,6 +75,9 @@ configure_gcc-3.3_i686-pc-mingw32 += --enable-threads=win32 --enable-hash- 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-hash-synchronization --disable-multilib +configure_WindowMaker-0.80.2_$(target) += --prefix=$(shell pwd)/upstream/install/$(target) +configure_WindowMaker-0.80.2_$(target) += --host=i686-pc-linux-gnu --x-libraries=$(shell pwd)/upstream/install/$(target)/lib + .install_jode-1.1.1_java: .download_java-getopt-1.0.9 configure_jode-1.1.1_java := --with-java=$(JAVA_HOME)/bin/java --with-javac=$(JAVA_HOME)/bin/javac @@ -98,6 +101,15 @@ environment_libmspack-20030726_$(target) += AR="$(shell pwd)/upstream/install/$( environment_libmspack-20030726_$(target) += AR2=$(shell pwd)/upstream/install/$(target)/bin/ranlib environment_libmspack-20030726_$(target) += OPTIM="-ffunction-sections -fdata-sections -O3" +# WindowMaker configury doesn't obey --target +environment_WindowMaker-0.80.2_$(target) += PATH=$(shell pwd)/upstream/install/$(target)/bin:$$PATH +environment_WindowMaker-0.80.2_$(target) += CC=$(shell pwd)/upstream/install/bin/$(target)-gcc +environment_WindowMaker-0.80.2_$(target) += AR="$(shell pwd)/upstream/install/$(target)/bin/ar" +environment_WindowMaker-0.80.2_$(target) += AR2=$(shell pwd)/upstream/install/$(target)/bin/ranlib +environment_WindowMaker-0.80.2_$(target) += LDFLAGS="-lXext" +make_install_WindowMaker-0.80.2_$(target) := -C WINGs install; make -C wrlib +make_WindowMaker-0.80.2_$(target) := WINGs + environment_gcc_3.3_$(target) += PATH=$(shell pwd)/upstream/install/bin:$$PATH .PRECIOUS: .vendor .download_% .configure_%_$(target) .install_%_$(target) @@ -195,7 +207,7 @@ endif cd upstream/$*/build-$(target); \ $(setcc) PATH=$$PATH:`pwd`/../../install/bin \ $(environment_$*_$(target)) \ - make $(setcc) $(environment_$*_$(target)) + make $(make_$*_$(target)) $(setcc) $(environment_$*_$(target)) touch $@ .install_libmspack-20030726_$(target): .build_libmspack-20030726_$(target); true @@ -205,7 +217,7 @@ endif cd upstream/$*/build-$(target); \ $(setcc) PATH=$$PATH:`pwd`/../../install/bin \ $(environment_$*_$(target)) \ - make install $(setcc) $(environment_$*_$(target)) + make $(make_install_$*_$(target)) install $(setcc) $(environment_$*_$(target)) touch $@ # jikes has a special target to autodetect a pre-installed jikes, and to autodetect the JVM's $CLASSPATH diff --git a/next.build b/next.build index 0c68705..bcbe8be 100644 --- a/next.build +++ b/next.build @@ -1 +1 @@ -07DF +07ED diff --git a/src/org/ibex/plat/Darwin.cc b/src/org/ibex/plat/Darwin.cc index 67400e1..7ab8696 100644 --- a/src/org/ibex/plat/Darwin.cc +++ b/src/org/ibex/plat/Darwin.cc @@ -590,8 +590,8 @@ static OSStatus windowEventHandler(EventHandlerCallRef handler, EventRef e, void r = WC(GetEventParameter)(e,kEventParamMouseWheelDelta,typeSInt32,NULL,sizeof(delta),NULL,&delta); checkStatus(r,"GetEventParameter"); switch(axis) { - case kEventMouseWheelAxisX: surface->HScroll(40 * delta); break; - case kEventMouseWheelAxisY: surface->VScroll(40 * delta); break; + case kEventMouseWheelAxisX: surface->HScroll((jint)(40 * delta)); break; + case kEventMouseWheelAxisY: surface->VScroll((jint)(40 * delta)); break; } return noErr; } diff --git a/src/org/ibex/plat/Win32.cc b/src/org/ibex/plat/Win32.cc index 9834ce2..4c0369f 100644 --- a/src/org/ibex/plat/Win32.cc +++ b/src/org/ibex/plat/Win32.cc @@ -148,7 +148,7 @@ static unsigned char hand_cursor_and[32 * 4] = { void org::ibex::plat::Win32::natPreInit() { // Win32 throws stderr in the trash unless you designate your binary as a "console binary" - if (org::ibex::Log::logstream == java::lang::System::err) { + if (org::ibex::util::Log::logstream == java::lang::System::err) { AllocConsole(); freopen("CONOUT$", "w+t", stderr); }