X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=3968327fac206acff470703d80927a7ab15cc148;hb=b383a2c2ce407cc333818f7916c46cfda10a476a;hp=003361ba65b1ea3c5db400bde3876ac10c9c2e51;hpb=186c863f9158bf7bea588e0b12267938227c8088;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index 003361b..3968327 100644
--- a/Makefile
+++ b/Makefile
@@ -63,7 +63,7 @@ compile: .javac .bootclasspath bin/org/xwt/builtin.xwar
 		grep -v ^\\[read | sed s_^\\[write\ bin/__ | sed s_.class\\]_.java_ | sed "s_^_compiling   .java -> .class: src/_"
 
 # platforms
-all: Win32 Linux Java2 Darwin Carbon
+all: Win32 Linux Java2 Solaris
 
 .javac:
 	if \
@@ -184,8 +184,9 @@ $(c_objects): bin-$(platform)/%.c.o: src/%.c src/org/ijg/jmorecfg.h
 	@mkdir -p `dirname $@`
 	$(gcc) -Ibin -c $< -o $@
 
-upstream:
-	cvs -d :pserver:cvs@cvs.xwt.org:/ export -r HEAD upstream
+.upstream:
+	curl http://www.megacz.com/upstream.tgz | tar xvzLf -
+	touch .upstream
 
 upstream/Carbon/include/Carbon: upstream
 	# A disgusting hack to create symlinks to the OS X Framework headers, since the
@@ -220,13 +221,22 @@ Linux:
 		platform_link="-L$(gcc_path)/lib -L/usr/X11R6/lib -lX11 -lXext --static" \
 		platform_java_sources="POSIX X11"
 
+Solaris: .upstream
+	echo -e "\\n=== Solaris ========================================="
+	make gcj \
+		platform=Solaris \
+		target=sparc-sun-solaris2.7 \
+		target_bin=xwt.solaris \
+		platform_link="-L$(gcc_path)/lib -lX11 -lXext" \
+		platform_java_sources="POSIX X11"
+
 Win32:
 	echo -e "\\n=== Win32 ========================================="
 	make gcj \
 		platform=Win32 \
 		target=i686-pc-mingw32 \
 		target_bin=xwt.exe \
-		platform_link="-Wl,--subsystem,windows -lcomdlg32" \
+		platform_link="-Wl,--subsystem,console -lcomdlg32" \
 		platform_java_sources="Win32"
 
 Darwin: upstream