2003/06/18 07:45:48
authormegacz <megacz@xwt.org>
Fri, 30 Jan 2004 07:02:01 +0000 (07:02 +0000)
committermegacz <megacz@xwt.org>
Fri, 30 Jan 2004 07:02:01 +0000 (07:02 +0000)
darcs-hash:20040130070201-2ba56-692dce68daae0ccf765e254bb9f8efc604283928.gz

Makefile
src/org/xwt/js/JS.java

index c55a2db..1cca13e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -30,11 +30,11 @@ gcc_path               := $(shell pwd)/gcc/install
 gcc_optimizations      := -O2
 debug                  := 
 gcc_flags              := $(gcc_optimizations) $(debug) -Isrc/org/ijg
-gcj_flags              := -fCLASSPATH=bin 
+gcj_flags              := -fCLASSPATH=src
 gcj                    := $(gcc_path)/bin/$(target)-gcj $(gcj_flags) $(gcc_flags)
 g++                    := $(gcc_path)/bin/$(target)-g++ $(gcc_flags)
 gcc                    := $(gcc_path)/bin/$(target)-gcc $(gcc_flags)
-gcjh                   := $(gcc_path)/bin/gcjh
+gcjh                   := $(gcc_path)/bin/$(target)-gcjh
 
 as                     := $(gcc_path)/$(target)/bin/as
 ar                     := $(gcc_path)/$(target)/bin/ar
index 094eba1..3c8298f 100644 (file)
@@ -115,7 +115,6 @@ public abstract class JS {
 
     /** a Callable which was compiled from JavaScript code */
     public static class CompiledFunction extends CompiledFunctionImpl {
-        public Object call(JS.Array args, JS.Scope scope) throws JS.Exn { return super.call(args, scope); }
         CompiledFunction(String sourceName, int firstLine, Reader sourceCode, Scope scope) throws IOException {
             super(sourceName, firstLine, sourceCode, scope);
         }