gcc_path := upstream/install
gcc_optimizations := -O2
#gcc_optimizations := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls -finline-functions -funroll-loops -ffunction-sections -fdata-sections
-gcc_flags := $(gcc_optimizations) -Ibuild/h
+gcc_flags := $(gcc_optimizations) -Ibuild/h -Iupstream/jpeg-6b/src/
gcj_flags += -fCLASSPATH=build/java
gcj := $(gcc_path)/bin/$(target)-gcj $(gcc_flags) $(gcj_flags)
g++ := $(gcc_path)/bin/$(target)-g++ $(gcc_flags)
make -sC upstream .jikes
$(gcc_path)/bin/$(target)-gcj:
- make -sC upstream gcc-3.3.1-$(target)
+ make -sC upstream gcc-3.3-$(target)
# PHASE 1b: human-written inputs
java_sources += $(handwritten_java_pp_sources:src/%.java.pp=build/java/%.java)
java_sources += $(handwritten_mips_sources:src/%.mips.c=build/java/%.java)
java_sources += build/java/org/xwt/Builtin.java
-java_sources += build/java/org/xwt/imp/Freetype.java
+#java_sources += build/java/org/xwt/imp/Freetype.java
$(handwritten_java_sources:src/%.java=build/java/%.java): build/java/%.java: src/%.java
@echo "symlinking: $@"
@mkdir -p `dirname $@`; \
build/mips/freetype.mips: $(freetype_mips_objects)
@echo "compiling .c -> .mips: $@"
@mkdir -p build/mips
- @make -sC upstream newlib-1.11.0/src newlib-1.11.0/build-mips/.installed gcc-3.3.1-mips freetype-2.1.4/src .headers target=mips
+ @make -sC upstream newlib-1.11.0/src newlib-1.11.0/build-mips/.installed gcc-3.3-mips freetype-2.1.4/src .headers target=mips
@$(gcc_path)/bin/mips-gcc \
--static \
-mabi=32 \
@make gcj platform=Win32 target=i686-pc-mingw32 target_bin=xwt.exe platform_link="-Wl,--subsystem,windows -lcomdlg32" platform_java_sources=Win32
Carbon:
- @make gcj platform=Carbon arget=powerpc-apple-darwin platform_link="$(gcc_path)/lib/libgcj.a -Xlinker -framework -Xlinker Carbon" platform_java_sources="POSIX Carbon"
+ @make gcj platform=Carbon arget=powerpc-apple-darwin platform_link="$(gcc_path)/lib/libgcj.a -Wl,-framework,Carbon,-framework,OpenGL,-framework,AGL,-framework,SystemConfiguration" platform_java_sources="POSIX Carbon OpenGL"
JVM: build/JVM/xwt.jar
build/JVM/xwt.jar:.compile