From e50a5acee77ed9eb010c44e35a945ca01b0d11ed Mon Sep 17 00:00:00 2001 From: adam Date: Thu, 12 Feb 2004 08:11:54 +0000 Subject: [PATCH] more build fixups darcs-hash:20040212081154-5007d-301f9e58df049158a30670f6c2435c0b1210abf6.gz --- Makefile | 13 +++++++++++-- next.build | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 6c2e7c2..af934a3 100644 --- a/Makefile +++ b/Makefile @@ -17,9 +17,17 @@ dist-clean: find upstream -name config.cache -exec rm {} \; test -e upstream/mips && make -C upstream/mips clean +libwing_Linux := -Lupstream/install/i686-pc-linux-gnu/lib/ +libwing_Linux += upstream/install/i686-pc-linux-gnu/lib/libWINGs.a +libwing_Linux += upstream/install/i686-pc-linux-gnu/lib/libwraster.a + +libwing_Solaris := -Lupstream/install/sparc-sun-solaris2.7/lib/ +libwing_Solaris += upstream/install/sparc-sun-solaris2.7/lib/libWINGs.a +libwing_Solaris += upstream/install/sparc-sun-solaris2.7/lib/libwraster.a + 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="-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" +Linux: ; make gcj platform=Linux link_flags="$(libwing_Linux) -lXpm -lX11 -lXext" +Solaris: ; make gcj platform=Solaris link_flags="$(libwing_Solaris) -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)" @@ -186,6 +194,7 @@ build/$(platform)/$(platform).ar: $(nonplat_java_sources:build/java/%.java=build upstream/install/$(target)/bin/ranlib $@ upstream/jpeg-6b/build-$(target)/libjpeg.a: .install_jpeg-6b_$(target) + build/$(platform)/$(target_bin): build/$(platform)/org/ibex/plat/$(platform).cc.o upstream/jpeg-6b/build-$(target)/libjpeg.a build/$(platform)/builtin.o build/$(platform)/$(platform).ar build/$(platform)/org/ibex/plat/$(platform).java.o @echo -e "\n\033[1mlinking .o -> $(target_bin)\033[0m" mkdir -p build/$(platform) diff --git a/next.build b/next.build index bfe5f25..f619b9a 100644 --- a/next.build +++ b/next.build @@ -1 +1 @@ -07F2 +07F3 -- 1.7.10.4