projects
/
org.ibex.core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a92a0ae
)
yet another buildfix
author
adam
<adam@megacz.com>
Wed, 14 Apr 2004 20:49:22 +0000
(20:49 +0000)
committer
adam
<adam@megacz.com>
Wed, 14 Apr 2004 20:49:22 +0000
(20:49 +0000)
darcs-hash:
20040414204922
-5007d-
4b758b1f634df69bb3e6afa9269515df4f7cbdd4
.gz
Makefile
patch
|
blob
|
history
Makefile.upstream
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
2c873c6
..
b821aeb
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-379,8
+379,8
@@
build/mips/mipsapps.mips: build/mips/org/ibex/graphics/Freetype.c.o build/mips/o
upstream/install/bin/mips-unknown-elf-gcc \
--static \
-march=mips1 \
upstream/install/bin/mips-unknown-elf-gcc \
--static \
-march=mips1 \
- -T upstream/nestedvm/src/org/xwt/mips/linker.ld \
- -L upstream/nestedvm/build/org/xwt/mips/ \
+ -T upstream/org.ibex.nestedvm/src/org/xwt/mips/linker.ld \
+ -L upstream/org.ibex.nestedvm/build/org/xwt/mips/ \
-L upstream/freetype-2.1.4/src/objs \
-L upstream/libmspack-20030726/build-mips-unknown-elf/ \
-o $@ \
-L upstream/freetype-2.1.4/src/objs \
-L upstream/libmspack-20030726/build-mips-unknown-elf/ \
-o $@ \
diff --git
a/Makefile.upstream
b/Makefile.upstream
index
dd447a8
..
d67a929
100644
(file)
--- a/
Makefile.upstream
+++ b/
Makefile.upstream
@@
-182,7
+182,7
@@
endif
cd upstream/libmspack-20030726/build-$(target); ln -sf ../src/mspack/* .
touch $@
cd upstream/libmspack-20030726/build-$(target); ln -sf ../src/mspack/* .
touch $@
-.install_freetype-2.1.4_mips-unknown-elf: .install_nestedvm .download_freetype-2.1.4
+.install_freetype-2.1.4_mips-unknown-elf: .install_org.ibex.nestedvm .download_freetype-2.1.4
cd upstream/freetype-2.1.4/src; \
make setup ansi; \
PATH=$$PATH:`pwd`/../../install/bin make \
cd upstream/freetype-2.1.4/src; \
make setup ansi; \
PATH=$$PATH:`pwd`/../../install/bin make \
@@
-202,7
+202,7
@@
endif
.install_libmspack-20030726_$(target): .build_libmspack-20030726_$(target); true
.install_libmspack-20030726_$(target): .build_libmspack-20030726_$(target); true
-.install_gcc-3.3_mips-unknown-elf: .install_nestedvm
+.install_gcc-3.3_mips-unknown-elf: .install_org.ibex.nestedvm
touch $@
.install_%_$(target): .build_%_$(target)
touch $@
.install_%_$(target): .build_%_$(target)