From f1b6ac9a023d7115901ffb0fdd93732176f3b066 Mon Sep 17 00:00:00 2001 From: megacz Date: Fri, 30 Jan 2004 08:04:15 +0000 Subject: [PATCH] 2004/01/19 20:49:48 darcs-hash:20040130080415-2ba56-ae6cd245ae5f41edf23b4ed84131f8cdeee62cae.gz --- Makefile | 2 +- src/org/xwt/Main.java | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 4de2701..15bdc1f 100644 --- a/Makefile +++ b/Makefile @@ -164,7 +164,7 @@ build/$(platform)/$(platform).ar: $(java_sources:build/java/%.java=build/$(platf upstream/install/$(target)/bin/ranlib $@ upstream/jpeg-6b/build-$(target)/libjpeg.a: .install_jpeg-6b_$(target) -build/$(platform)/$(target_bin): build/$(platform)/org/xwt/plat/$(platform).cc.o upstream/jpeg-6b/build-$(target)/libjpeg.a build/$(platform)/builtin.o build/$(platform)/$(platform).ar +build/$(platform)/$(target_bin): build/$(platform)/org/xwt/plat/$(platform).cc.o upstream/jpeg-6b/build-$(target)/libjpeg.a build/$(platform)/builtin.o build/$(platform)/$(platform).ar build/$(platform)/org/xwt/plat/$(platform).java.o @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 $@ -Lupstream/install/$(target)/lib build/$(platform)/org/xwt/plat/$(platform).java.o $^ $(link_flags) diff --git a/src/org/xwt/Main.java b/src/org/xwt/Main.java index 533e763..468e69b 100644 --- a/src/org/xwt/Main.java +++ b/src/org/xwt/Main.java @@ -14,9 +14,6 @@ import org.bouncycastle.util.encoders.Base64; /** Entry point for the XWT Engine; handles splash screen, initial xwar loading, and argument processing */ public class Main { - // to prevent GCJ from dropping these classes - private static final Class[] keep = new Class[] { GCJ.class, Linux.class, Solaris.class, Darwin.class, Win32.class }; - /** * FEATURE: this should be implemented using self-emulation * Used for security checks. If this is null, it means that only -- 1.7.10.4