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:
dbe058a
)
2003/05/10 05:36:27
author
david
<david@xwt.org>
Fri, 30 Jan 2004 07:00:06 +0000
(07:00 +0000)
committer
david
<david@xwt.org>
Fri, 30 Jan 2004 07:00:06 +0000
(07:00 +0000)
darcs-hash:
20040130070006
-0c9ea-
2be402736158acaa29dd8c010ac328778319b7f6
.gz
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
2c80eb2
..
5cd2d79
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-188,7
+188,7
@@
$(c_objects): bin-$(platform)/%.c.o: src/%.c src/org/ijg/jmorecfg.h
$(gcc) -Ibin -c $< -o $@
upstream:
$(gcc) -Ibin -c $< -o $@
upstream:
- cvs -d :pserver:cvs@cvs.xwt.org:/ export upstream HEAD
+ cvs -d :pserver:cvs@cvs.xwt.org:/ export -r HEAD upstream
upstream/Carbon/include/Carbon:
# A disgusting hack to create symlinks to the OS X Framework headers, since the
upstream/Carbon/include/Carbon:
# A disgusting hack to create symlinks to the OS X Framework headers, since the
@@
-232,13
+232,13
@@
Win32:
Darwin: upstream
echo -e "\\n=== Darwin ========================================="
Darwin: upstream
echo -e "\\n=== Darwin ========================================="
- ranlib upstream/darwin/*.a
- ar x /usr/lib/libcc_dynamic.a upstream/darwin/darwin-fpsave.o
+ ranlib upstream/Darwin/lib/*.a
+ ar x /usr/lib/libcc_dynamic.a upstream/Darwin/lib/darwin-fpsave.o
make gcj \
platform=Darwin \
target=powerpc-apple-darwin \
target_bin=xwt.darwin \
make gcj \
platform=Darwin \
target=powerpc-apple-darwin \
target_bin=xwt.darwin \
- platform_link="upstream/darwin/*.[oa] $(gcc_path)/lib/libgcj.a" \
+ platform_link="upstream/Darwin/lib/*.[oa] $(gcc_path)/lib/libgcj.a" \
platform_java_sources="POSIX X11"
Carbon: upstream/Carbon/include/Carbon upstream
platform_java_sources="POSIX X11"
Carbon: upstream/Carbon/include/Carbon upstream