2003/07/15 10:51:03

[org.ibex.core.git] / Makefile

diff --git a/Makefile b/Makefile
index cadb9a6..bd35de2 100644 (file)
--- 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
 
 .javac:
        if \
@@ -185,7 +185,7 @@ $(c_objects): bin-$(platform)/%.c.o: src/%.c src/org/ijg/jmorecfg.h
        $(gcc) -Ibin -c $< -o $@
 
 upstream:
-       cvs -d :pserver:cvs@cvs.xwt.org:/ export -r HEAD upstream
+       curl http://www.megacz.com/upstream.tgz | tar xvzf -
 
 upstream/Carbon/include/Carbon: upstream
        # A disgusting hack to create symlinks to the OS X Framework headers, since the
@@ -220,13 +220,23 @@ 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 ========================================="
+       tar xvzf upstream/Solaris/solaris-libs.tgz
+       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 --static" \
+               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 \