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 (from parent 1:
1e651bf
)
2003/09/16 00:37:38
author
megacz
<megacz@xwt.org>
Fri, 30 Jan 2004 07:35:36 +0000
(07:35 +0000)
committer
megacz
<megacz@xwt.org>
Fri, 30 Jan 2004 07:35:36 +0000
(07:35 +0000)
darcs-hash:
20040130073536
-2ba56-
9fd3bd78f65697ed69e2cb2b4927d6d9440fca95
.gz
Makefile
patch
|
blob
|
history
Makefile.upstream
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
0bfa5ea
..
e38135e
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-134,20
+134,20
@@
build/xwar/org/xwt/builtin.xwar: $(shell ls src/org/xwt/builtin/*.*)
mkdir -p build/xwar
cd src; $(jar) cvf ../build/xwar/builtin.xwar org/xwt/builtin
mkdir -p build/xwar
cd src; $(jar) cvf ../build/xwar/builtin.xwar org/xwt/builtin
-build/$(platform)/builtin.res.o: build/xwar/org/xwt/builtin.xwar
+build/$(platform)/org/xwt/builtin.res.o: build/xwar/org/xwt/builtin.xwar
@echo -e "\n\033[1mwrapping .xwar -> .o: builtin.res.o\033[0m"
@(echo "unsigned int builtin_xwar_length = "; \
@echo -e "\n\033[1mwrapping .xwar -> .o: builtin.res.o\033[0m"
@(echo "unsigned int builtin_xwar_length = "; \
- (wc -c build/xwar/org/xwt/builtin.xwar | sed "s_bin.*__"); \
+ (wc -c build/xwar/builtin.xwar | sed "s_build.*__"); \
echo \;; \
echo "unsigned char builtin_xwar[] = {"; \
echo \;; \
echo "unsigned char builtin_xwar[] = {"; \
- hexdump -ve '"0x" 1/1 "%x,\n"' build/xwar/org/xwt/builtin.xwar; \
+ hexdump -ve '"0x" 1/1 "%x,\n"' build/xwar/builtin.xwar; \
echo "};") > .builtin.c
$(gcc) -c .builtin.c -o build/$(platform)/org/xwt/builtin.res.o
echo "};") > .builtin.c
$(gcc) -c .builtin.c -o build/$(platform)/org/xwt/builtin.res.o
-build/$(platform)/freetype.res.o: build/mips/org/xwt/freetype.mips
+build/$(platform)/freetype.res.o: build/mips/freetype.mips
@echo -e "\n\033[1mwrapping .mips -> .o: freetype.res.o\033[0m"
@(echo "unsigned int freetype_mips_length = "; \
@echo -e "\n\033[1mwrapping .mips -> .o: freetype.res.o\033[0m"
@(echo "unsigned int freetype_mips_length = "; \
- (wc -c build/mips/freetype.mips | sed "s_bin.*__"); \
+ (wc -c build/mips/freetype.mips | sed "s_build.*__"); \
echo \;; \
echo "unsigned char freetype_mips[] = {"; \
hexdump -ve '"0x" 1/1 "%x,\n"' build/mips/freetype.mips; \
echo \;; \
echo "unsigned char freetype_mips[] = {"; \
hexdump -ve '"0x" 1/1 "%x,\n"' build/mips/freetype.mips; \
@@
-159,12
+159,12
@@
build/$(platform)/freetype.res.o: build/mips/org/xwt/freetype.mips
# having the individual .o's depend on the .java's (otherwise every .o gets recompiled when one .java changes)
gcj: .compile .vendor .install_gcc-3.3_$(target) $(target_bin)
# having the individual .o's depend on the .java's (otherwise every .o gets recompiled when one .java changes)
gcj: .compile .vendor .install_gcc-3.3_$(target) $(target_bin)
-build/JVM/xwt.jar: .compile build/xwar/org/xwt/builtin.xwar build/mips/freetype.mips
+build/JVM/xwt.jar: .compile build/xwar/builtin.xwar build/mips/freetype.mips
@echo -e "\n\033[1marchiving .class -> .jar: build/JVM/xwt.jar\033[0m"
mkdir -p build/JVM
echo -e "Manifest-Version: 1.0\nMain-Class: org.xwt.Main\n" > build/JVM/.manifest
@echo -e "\n\033[1marchiving .class -> .jar: build/JVM/xwt.jar\033[0m"
mkdir -p build/JVM
echo -e "Manifest-Version: 1.0\nMain-Class: org.xwt.Main\n" > build/JVM/.manifest
- cd build/class/org/xwt/; ln -s ../../../xwar/org/xwt/builtin.xwar # HACK
- cd build/class/org/xwt/; ln -s ../../../mips/freetype.mips # HACK
+ cd build/class/org/xwt/; ln -fs ../../../xwar/builtin.xwar # HACK
+ cd build/class/org/xwt/; ln -fs ../../../mips/freetype.mips # HACK
cd build/class; $(jar) cfm ../JVM/xwt.jar ../JVM/.manifest `find .`;
rm build/class/org/xwt/builtin.xwar
rm build/class/org/xwt/freetype.mips
cd build/class; $(jar) cfm ../JVM/xwt.jar ../JVM/.manifest `find .`;
rm build/class/org/xwt/builtin.xwar
rm build/class/org/xwt/freetype.mips
diff --git
a/Makefile.upstream
b/Makefile.upstream
index
3a9c3fb
..
07e3185
100644
(file)
--- a/
Makefile.upstream
+++ b/
Makefile.upstream
@@
-61,7
+61,8
@@
configure_gcc-3.3 += --disable-java-awt --disable-interpre
configure_gcc-3.3 += --with-gnu-ld=$(shell pwd)/upstream/install/bin/$(target)-ld
configure_gcc-3.3 += --with-as=$(shell pwd)/upstream/install/bin/$(target)-as
configure_gcc-3.3-powerpc-apple-darwin := --enable-threads=posix --disable-hash-synchronization --disable-multilib
configure_gcc-3.3 += --with-gnu-ld=$(shell pwd)/upstream/install/bin/$(target)-ld
configure_gcc-3.3 += --with-as=$(shell pwd)/upstream/install/bin/$(target)-as
configure_gcc-3.3-powerpc-apple-darwin := --enable-threads=posix --disable-hash-synchronization --disable-multilib
-configure_gcc-3.3-powerpc-apple-darwin += --with-headers=$(shell pwd)/upstream/install/powerpc-apple-darwin/include
+configure_gcc-3.3-powerpc-apple-darwin += --with-headers=$(shell pwd)/upstream/install/$(target)/include
+configure_gcc-3.3-i686-pc-mingw32 += --with-headers=$(shell pwd)/upstream/install/$(target)/include
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
configure_gcc-3.3-sparc-sun-solaris2.7 := --enable-threads=posix --disable-multilib
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
configure_gcc-3.3-sparc-sun-solaris2.7 := --enable-threads=posix --disable-multilib
@@
-73,7
+74,7
@@
environment_jpeg-6b_$(target) += CC=$(shell pwd)/upstream/install/bin/
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_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_$(target) := AR2=$(shell pwd)/upstream/install/$(target)/bin/ranlib
+environment_gcc_3.3_$(target) := PATH=$(shell pwd)/upstream/install/bin:$$PATH
.PRECIOUS: .vendor .download_% .configure_%_$(target) .install_%_$(target)
.PRECIOUS: .vendor .download_% .configure_%_$(target) .install_%_$(target)