$(cc_objects): bin-$(platform)/%.cc.o: src/%.cc $(java_headers) src/org/ijg/jmorecfg.h
@echo "compiling .cc -> .o: $<"
@mkdir -p `dirname $@`
- $(g++) -I/usr/X11R6/include/ -I$(gcc_path)/include -Ibin -c $< -o $@
+ $(g++) -I/usr/X11R6/include/ -I$(gcc_path)/include -Ibin -Iupstream/$(platform)/include -Wno-multichar -c $< -o $@
$(c_objects): bin-$(platform)/%.c.o: src/%.c src/org/ijg/jmorecfg.h
@echo "compiling .c -> .o: $<"
$(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
+ # standard GCC doesn't know how to search Frameworks for header files.
+ outdir="upstream/Carbon/include"; \
+ librarydir="/System/Library"; \
+ frameworksubdir="Frameworks"; \
+ cd $$outdir; \
+ function CreateHeaderDirectories() \
+ { \
+ for framework in `ls -d $$1/*.framework`; do \
+ name=`echo $$framework | sed 's/.*\/\([^/]*\)\.framework/\1/'`; \
+ if [[ $$name != "" && ! -e $$name && -e $$framework/Headers ]]; then \
+ ln -s $$framework/Headers $$name; \
+ if [[ -e $$framework/$$frameworksubdir ]]; then \
+ CreateHeaderDirectories $$framework/$$frameworksubdir; \
+ fi; \
+ fi; \
+ done; \
+ }; \
+ CreateHeaderDirectories $$librarydir/$$frameworksubdir;
## Platforms ##############################################################################
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: upstream/Carbon/include/Carbon upstream
echo -e "\\n=== Carbon ========================================="
- ranlib upstream/darwin/*.a
- ar x /usr/lib/libcc_dynamic.a upstream/darwin/darwin-fpsave.o
make gcj \
platform=Carbon \
target=powerpc-apple-darwin \
target_bin=xwt.carbon \
- platform_link="upstream/darwin/*.[oa] $(gcc_path)/lib/libgcj.a" \
+ platform_link="$(gcc_path)/lib/libgcj.a -Xlinker -framework -Xlinker Carbon" \
platform_java_sources="POSIX Carbon"
Java2: $(java_classes) bin/org/xwt/builtin.xwar