2003/09/15 06:36:01

darcs-hash:20040130073529-2ba56-0d78a2fb4def12902f957afcb97cf36994383d3b.gz

diff --git a/Makefile b/Makefile
index 2a125e4..14f3505 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -39,8 +39,14 @@ jar                    := $(shell ((type fastjar &>/dev/null) && echo fastjar) |
 
 include Makefile.upstream
 
-# figure out what stuff in org.xwt.plat.* this platform requires (its superclasses)
+# HACK: FIXME
+ifeq ($(platform),Darwin)
 superclass_org.xwt.plat.Platform:; echo org.xwt.plat.OpenGL
+else
+superclass_org.xwt.plat.Platform:;
+endif
+
+# figure out what stuff in org.xwt.plat.* this platform requires (its superclasses)
 superclass_%: 
        @echo $*
        @make -s superclass_org.xwt.plat.$(shell grep extends src/`echo $* | sed s_\\\\._/_g`.java | head -n 1 | sed s_.\*extends\ __ | sed s_\ .\*__)

diff --git a/Makefile.upstream b/Makefile.upstream
index d08a488..0078d65 100644 (file)
--- a/Makefile.upstream
+++ b/Makefile.upstream
@@ -69,10 +69,12 @@ configure_gcc-3.3-mips-unknown-elf      := --enable-languages=c --nfp --enable-m
 
 # libjpeg's configury doesn't obey --target
 environment_jpeg-6b_$(target)           := PATH=$(shell pwd)/upstream/install/$(target)/bin:$$PATH
-environment_jpeg-6b_$(target)           += CC=$(shell pwd)/upstream/install/$(target)/bin/gcc
+environment_jpeg-6b_$(target)           += CC=$(shell pwd)/upstream/install/bin/$(target)-gcc
 environment_jpeg-6b_$(target)           += AR="$(shell pwd)/upstream/install/$(target)/bin/ar rc"
 environment_jpeg-6b_$(target)           += AR2=$(shell pwd)/upstream/install/$(target)/bin/ranlib
 
+environment_gcc-3.3                     := AR2=$(shell pwd)/upstream/install/$(target)/bin/ranlib
+
 .PRECIOUS: .vendor .download_% .configure_%_$(target) .install_%_$(target)
 
 # vendor-supplied binaries and headers; this is stuff that comes with various OSes