From 0f9bee48423f278321e30beebec68470b384033b Mon Sep 17 00:00:00 2001 From: megacz Date: Fri, 30 Jan 2004 07:36:45 +0000 Subject: [PATCH] 2003/09/26 02:54:50 darcs-hash:20040130073645-2ba56-17f33a595300fc9999dfc47653821b62113bd5d8.gz --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 86fd40e..7da3b84 100644 --- a/Makefile +++ b/Makefile @@ -4,10 +4,10 @@ # -all: JVM Darwin Linux Win32 Solaris +all: JVM Linux Win32 Darwin Solaris JVM: build/JVM/xwt.jar -Linux: ; make gcj platform=Linux target=i686-pc-linux-gnu link_flags="-lX11 -lXext --static" +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 Darwin: ; make gcj platform=Darwin target=powerpc-apple-darwin link_flags="$(darwin_linker_flags)" @@ -119,16 +119,16 @@ 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 := $(nonplat_java_sources:build/java/%.java=build/$(platform)/%.java.o) -build/$(platform)/$(platform).ar: $(java_objects) build/$(platform)/org/xwt/plat/$(platform).cc.o build/$(platform)/builtin.o $(plat_java_sources:build/java/%.java=build/$(platform)/%.java.o) +build/$(platform)/$(platform).ar: $(java_objects) build/$(platform)/builtin.o $(plat_java_sources:build/java/%.java=build/$(platform)/%.java.o) @echo -e "\n\033[1marchiving .o -> .a\033[0m" mkdir -p build/$(platform) upstream/install/bin/$(target)-ar rc $@ $? upstream/install/bin/$(target)-ranlib $@ -$(target_bin): build/$(platform)/$(platform).ar upstream/jpeg-6b/build-$(target)/libjpeg.a +$(target_bin): build/$(platform)/$(platform).ar build/$(platform)/org/xwt/plat/$(platform).cc.o upstream/jpeg-6b/build-$(target)/libjpeg.a @echo -e "\n\033[1mlinking .o -> $(target_bin)\033[0m" mkdir -p build/$(platform) - PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.xwt.Main -o build/$(platform)/$(target_bin) -Lupstream/install/$(target)/lib $(link_flags) $^ build/$(platform)/org/xwt/plat/$(platform).java.o + PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.xwt.Main -o build/$(platform)/$(target_bin) -Lupstream/install/$(target)/lib $^ build/$(platform)/org/xwt/plat/$(platform).java.o $(link_flags) ############################################################################## -- 1.7.10.4