c_objects := $(c_sources:src/%.c=bin-$(platform)/%.c.o)
# tools
-gcc_path := $(shell pwd)/gcc
+gcc_path := $(shell pwd)/gcc/install
#gcc_optimizations := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls -finline-functions
#gcc_optimzations += -funroll-loops -ffunction-sections -fdata-sections
gcc_optimizations := -O0
## GCJ-Derived Platforms #######################################################################
# if the user doesn't change gcc_path, and it's not built, then we'll try to build it
-$(shell pwd)/gcc/bin/$(target)-gcj:
+$(shell pwd)/gcc/install/bin/$(target)-gcj:
make -C gcc
# java_classes is here to force compilation of the .class files (they get used via -Ibin/) without
$(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
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 \
- 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