X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=dda8468df07c9392a837e8fd0ea2ae54f4e357cd;hb=7d948d717d8eb7904141b1fa2d5fe5e131afda88;hp=427906d46b837840cd220aa6aab502fd7121ca1c;hpb=13a78fae8bd7d561bb7caf6b9d4972e3f22033f8;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index 427906d..dda8468 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 xvzf -
+	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 -L/usr/X11R6/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
@@ -242,7 +252,6 @@ Darwin: upstream
 
 Carbon: upstream/Carbon/include/Carbon upstream
 	echo -e "\\n=== Carbon ========================================="
-	cd gcc/install/bin; ln -sf gcjh powerpc-apple-darwin-gcjh
 	make gcj \
 		platform=Carbon \
 		target=powerpc-apple-darwin \
@@ -300,8 +309,7 @@ dist-private:
 	mv gcc gcc-
 	ln -s $(HOME)/dist.xwt.org-gcc gcc
 	mv -f gcc-/Makefile gcc/
-	mv -f gcc-/gcc.patch gcc/
-	mv -f gcc-/gcc-minimal.patch gcc/
+	mv -f gcc-/*.patch gcc/
 
 	# build it
 	nice -n 19 make all