X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=Makefile;h=5060835b7438131aaf04d2b8ebd5b3210a1f1185;hp=b839eaf344c1cb100676fc12e72400f3d9e4bcf7;hb=9fe5ab0b773fee33a8af3406b3e7b3fcd2303d76;hpb=9052d19c365d8a371f2f4d0c0d53417c1ec5c217 diff --git a/Makefile b/Makefile index b839eaf..5060835 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ JVM: build/JVM/xwt.jar Linux: ; make gcj platform=Linux target=i686-pc-linux-gnu link_flags="-lX11 -lXext --static" Solaris: ; make gcj platform=Solaris target=sparc-sun-solaris2.7 link_flags="-lX11 -lXext" Win32: ; make gcj platform=Win32 target=i686-pc-mingw32 link_flags="-Wl,--subsystem,windows -lcomdlg32" target_bin=xwt.exe -Darwin: ; make gcj platform=Darwin target=powerpc-apple-darwin link_flags="-lSystem -lmathCommon.A upstream/install/powerpc-apple-darwin/lib/crt1.o" +Darwin: ; make gcj platform=Darwin target=powerpc-apple-darwin link_flags="-lSystem -lmathCommon.A" ############################################################################# @@ -142,9 +142,8 @@ build/mips/%.c.o: src/%.c echo -e "\n\033[1mcompiling $< -> $@ (mips)\033[0m" upstream/install/bin/mips-unknown-elf-gcc -march=r3000 -I upstream/freetype-2.1.4/src/include -c -o $@ $< -build/mips/freetype.mips: build/mips/org/xwt/imp/Freetype.c.o +build/mips/freetype.mips: build/mips/org/xwt/imp/Freetype.c.o build/mips/org/xwt/imp/crt0.c.o build/mips/org/xwt/imp/syscalls.c.o make .install_freetype-2.1.4_mips-unknown-elf target=mips-unknown-elf - make build/mips/org/xwt/imp/Freetype.c.o target=mips-unknown-elf platform=mips @echo -e "\n\033[1mlinking .o -> .mips: $@\033[0m" mkdir -p build/mips upstream/install/bin/mips-unknown-elf-gcc \ @@ -153,7 +152,7 @@ build/mips/freetype.mips: build/mips/org/xwt/imp/Freetype.c.o -march=mips1 \ -T src/org/xwt/imp/linker.ld \ -Lbuild/mips \ - -Lupstream/freetype-2.1.4/objs \ + -Lupstream/freetype-2.1.4/src/objs \ -o $@ \ build/mips/org/xwt/imp/Freetype.c.o \ --strip \