X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=upstream%2FMakefile;h=0c76cc31dbf5d08e06ff687fddc4a48866b9d024;hb=bc9dd4abbcef277698861a1666f9a747e51d5d2f;hp=1003abdc4f4a5f369c09fd72ebd798377119d71c;hpb=bccbf89a59fdf52d8833947bd798dbd8d75d3348;p=org.ibex.core.git

diff --git a/upstream/Makefile b/upstream/Makefile
index 1003abd..0c76cc3 100644
--- a/upstream/Makefile
+++ b/upstream/Makefile
@@ -9,8 +9,8 @@ packages               := jikes-1.18 binutils-2.13.2.1 newlib-1.11.0 w32api-2.3
 # where to get stuff
 url_newlib-1.11.0      := ftp://sources.redhat.com/pub/newlib/newlib-1.11.0.tar.gz
 url_binutils-2.13.2.1  := ftp://ftp.gnu.org/gnu/binutils/binutils-2.13.2.1.tar.gz 
-url_w32api-2.3         := http://twtelecom.dl.sourceforge.net/sourceforge/mingw/w32api-2.3.tar.gz
-url_mingw-runtime-3.0  := http://twtelecom.dl.sourceforge.net/sourceforge/mingw/mingw-runtime-3.0.tar.gz
+url_w32api-2.3         := http://umn.dl.sourceforge.net/sourceforge/mingw/w32api-2.3.tar.gz
+url_mingw-runtime-3.0  := http://umn.dl.sourceforge.net/sourceforge/mingw/mingw-runtime-3.0.tar.gz
 url_freetype-2.1.4     := http://umn.dl.sourceforge.net/sourceforge/freetype/freetype-2.1.4.tar.gz
 url_gcc-3.3            := http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-3.3/gcc-3.3.tar.gz 
 url_jpeg-6b            := http://www.ijg.org/files/jpegsrc.v6b.tar.gz
@@ -19,7 +19,7 @@ url_jikes-1.18         := http://www.megacz.com/tmp/jikes-1.18.tgz       #ftp://
 # how to configure it
 configure_gcc-3.3                       := --enable-languages=c,c++,java --enable-gc-type=boehm --disable-shared --disable-jvmpi
 configure_gcc-3.3                       += --disable-java-awt --disable-interpreter --enable-static
-configure_gcc-3.3                       += --with-gnu-ld --with-gnu-as
+configure_gcc-3.3                       += --with-gnu-ld --with-gnu-as --enable-libgcj
 configure_gcc-3.3-powerpc-apple         := --enable-threads=posix --disable-hash-synchronization
 configure_gcc-3.3-i686-pc-mingw32       := --enable-threads=win32 --enable-hash-synchronization
 configure_gcc-3.3-i686-pc-linux-gnu     := --enable-threads=posix --enable-hash-synchronization
@@ -56,7 +56,21 @@ $(packages):
 $(packages:%=%-$(target)): %-$(target): %
 	make $</src $</build-$(target)/.installed target=$(patsubst $<-%,%,$@)
 
-gcc-3.3-mips: binutils-2.13.2.1-mips
+gcc-3.3-$(target): binutils-2.13.2.1-$(target)
+
+gcc-3.3-i686-pc-mingw32: .w32api .mingw-runtime
+
+.w32api:
+	@echo -e "\ndownloading w32api-2.3..."
+	@mkdir -p install/i686-pc-mingw32
+	@curl $(url_w32api-2.3) | tar xzf - -C install/i686-pc-mingw32
+	@touch .w32api
+
+.mingw-runtime:
+	@echo -e "\ndownloading mingw-runtime-3.0..."
+	@mkdir -p install/i686-pc-mingw32
+	@curl $(url_mingw-runtime-3.0) | tar xzf - -C install/i686-pc-mingw32
+	@touch .mingw-runtime
 
 # download the source code
 $(packages:%=%/src): %/src:
@@ -78,3 +92,13 @@ $(packages:%=%/build-$(target)/.installed): %/build-$(target)/.installed:
 	@cd $(patsubst %/build-$(target)/.installed,%,$@)/build-$(target); $(setcc) PATH=$$PATH:`pwd`/../../install/bin make install
 	@touch $(patsubst %/build-$(target)/.installed,%,$@)/build-$(target)/.installed
 
+
+.freetype:
+	@echo -e "\ndownloading freetype..."
+	@curl $(url_freetype-2.1.4) | tar xzf -
+	@touch $@
+
+.freetype-mips: .freetype
+	@cd freetype-2.1.4; make setup ansi; PATH=$$PATH:`pwd`/../install/bin make CC=mips-gcc AR=mips-ar
+	@PATH=$$PATH:`pwd`/../install/bin; mips-ranlib freetype-2.1.4/objs/libfreetype.a
+	@touch $@