From: megacz <megacz@xwt.org>
Date: Fri, 30 Jan 2004 06:56:17 +0000 (+0000)
Subject: 2003/03/05 07:40:25
X-Git-Tag: RC3~1186
X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=commitdiff_plain;h=c7502e686b4e08dbeb020b803d3f8205cf0c19a6

2003/03/05 07:40:25

darcs-hash:20040130065617-2ba56-bb48b81a9a7b2227092ec3c174ff8d204f5b4973.gz
---

diff --git a/Makefile b/Makefile
index aca3f84..9b49379 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
 
 # inputs
 jikes_java_sources     := $(shell find src -name *.java)
-gcj_java_sources       := $(shell find src -name *.java -not -path src/org/xwt/plat/\*) src/org/xwt/plat/GCJ.java $(platform_java_sources)
+gcj_java_sources       := $(shell find src -name *.java \! -path src/org/xwt/plat/\*) src/org/xwt/plat/GCJ.java $(platform_java_sources)
 xwar_sources           := $(shell ls src/org/xwt/builtin/*.png src/org/xwt/builtin/*.xwt src/org/xwt/builtin/*.xwf)
 cc_sources             := src/org/xwt/plat/$(platform).cc
 
@@ -24,10 +24,10 @@ gcc                    := $(gcc_path)/bin/$(target)-g++ $(gcc_flags)
 gcjh                   := $(gcc_path)/bin/gcjh
 ar                     := $(gcc_path)/$(target)/bin/ar
 strip                  := $(gcc_path)/$(target)/bin/strip
-jikes                  := jikes -extdirs ${JAVA_HOME}/jre/lib -nowarn
+jikes                  := jikes -bootclasspath /System/Library/Frameworks/JavaVM.framework/Versions/1.3.1/Classes/classes.jar -extdirs ${JAVA_HOME}/jre/lib -nowarn
 
 # platforms
-all_platforms          := Win32 Linux Java2
+all_platforms          := Win32 Linux Java2 Darwin
 
 
 ## Platform-Neutral ###########################################################################
@@ -42,7 +42,7 @@ compile: $(jikes_java_objects) bin/org/xwt/builtin.xwar
 all: $(all_platforms)
 
 $(jikes_java_objects): $(jikes_java_sources)
-	test "$(JAVA_HOME)"x != x || (echo "you forgot to set your $$JAVA_HOME environment variable"; false)
+	test "$(JAVA_HOME)"x != x || (echo "you forgot to set your JAVA_HOME environment variable"; false)
 	echo "compiling  .java -> .class:"
 	mkdir -p bin
 	$(jikes) -sourcepath src/ -classpath lib/libgcj-minimal.jar $(jikes_java_sources) -d bin/
@@ -120,6 +120,15 @@ Linux:
 		platform_link="-L$(gcc-path)/lib -L/usr/X11R6/lib -lX11 -lXext --static" \
 		platform_java_sources="src/org/xwt/plat/POSIX.java src/org/xwt/plat/X11.java"
 
+Darwin:
+	echo -e "\\n=== Darwin ========================================="
+	make gcj \
+		platform=Darwin \
+		target=powerpc-apple-darwin \
+		target_bin=xwt-x11.darwin \
+		platform_link="-L$(gcc-path)/lib -L/usr/X11R6/lib -lX11 -lXext --static" \
+		platform_java_sources="src/org/xwt/plat/POSIX.java src/org/xwt/plat/X11.java"
+
 Win32:
 	echo -e "\\n=== Win32 ========================================="
 	make gcj \