From: megacz <megacz@xwt.org>
Date: Fri, 30 Jan 2004 07:44:34 +0000 (+0000)
Subject: 2004/01/16 10:09:01
X-Git-Tag: RC3~165
X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=commitdiff_plain;h=9e45c0fbb7b61f0408c11d2167bee92aada845bd

2004/01/16 10:09:01

darcs-hash:20040130074434-2ba56-a31d1334814e54f370533ee98a8adf353d02946e.gz
---

diff --git a/Makefile b/Makefile
index ca9a769..d9aed02 100644
--- a/Makefile
+++ b/Makefile
@@ -218,12 +218,10 @@ build/mips/mipsapps.mips: build/mips/org/xwt/translators/Freetype.c.o build/mips
 	@echo -e "\n\033[1mlinking               .o -> .mips:  $@\033[0m"
 	mkdir -p build/mips build/res
 	upstream/install/bin/mips-unknown-elf-gcc \
-		-nostdlib \
 		--static \
 		-march=mips1 \
 		-T upstream/mips/org/xwt/mips/linker.ld \
 		-L upstream/mips/build/org/xwt/mips/ \
-		-L upstream/mips/build/ \
 		-L upstream/freetype-2.1.4/src/objs \
 		-L upstream/libmspack-20030726/build-mips-unknown-elf/ \
 		-o $@ \
diff --git a/src/org/xwt/translators/Freetype.c b/src/org/xwt/translators/Freetype.c
index f8172d9..2a1c798 100644
--- a/src/org/xwt/translators/Freetype.c
+++ b/src/org/xwt/translators/Freetype.c
@@ -34,14 +34,7 @@
 
 */
 
-#if 0
-/* Use this when org.xwt.mips is updated to the latest org.xwt.mips cvs */
 extern char *user_info[1024];
-#else
-extern char **_user_info;
-#define user_info _user_info
-#define _pause emu_pause
-#endif
 
 #define FT_Check(expr) do { \
     if((expr) != 0) { \
diff --git a/src/org/xwt/translators/MSPack.c b/src/org/xwt/translators/MSPack.c
index fd5ebe5..f09cf35 100644
--- a/src/org/xwt/translators/MSPack.c
+++ b/src/org/xwt/translators/MSPack.c
@@ -161,14 +161,7 @@ static struct mspack_system my_system =  {
     NULL
 };
 
-#if 0
-/* Use this when org.xwt.mips is updated to the latest org.xwt.mips cvs */
 extern char *user_info[1024];
-#else
-extern char **_user_info;
-#define user_info _user_info
-#define _pause emu_pause
-#endif
 
 int mspack_main() {
     struct mscab_decompressor *decomp;