X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=2a6a5dfa1bb776771006d377dc2b6a84e24772a6;hb=52ffc2a48fc74d013ae7fa401d9d0d405543c38e;hp=04e7e15fb894afb8e9c81a9e84ef8175dff11e20;hpb=4d9007ea179c900209a358278efa3528584b3532;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index 04e7e15..2a6a5df 100644
--- 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
@@ -161,9 +161,6 @@ $(java_headers): bin/%.h: bin/%.class
 		sed s_/_._g | sed s/.class$$// | sed s/.java$$// |\
 			xargs $(gcjh) --classpath .
 
-bin-$(platform)/org/xwt/js/CompiledFunctionImpl.java.o: src/org/xwt/js/CompiledFunctionImpl.java
-	$(gcj) -c bin/org/xwt/js/CompiledFunctionImpl*.class -o $@
-
 $(java_objects): bin-$(platform)/%.java.o: src/%.java
 	@echo "compiling   .java -> .o:     $<"
 	mkdir -p `dirname $@`
@@ -228,7 +225,8 @@ Win32:
 		platform=Win32 \
 		target=i686-pc-mingw32 \
 		target_bin=xwt.exe \
-		platform_link="-Wl,--subsystem,windows -lcomdlg32"
+		platform_link="-Wl,--subsystem,windows -lcomdlg32" \
+		platform_java_sources="Win32"
 
 Darwin: upstream
 	echo -e "\\n=== Darwin ========================================="