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
+gcc_optimizations := -O2
debug :=
gcc_flags := $(gcc_optimizations) $(debug) -Isrc/org/ijg
-gcj_flags := -fCLASSPATH=bin
+gcj_flags := -fCLASSPATH=src
gcj := $(gcc_path)/bin/$(target)-gcj $(gcj_flags) $(gcc_flags)
g++ := $(gcc_path)/bin/$(target)-g++ $(gcc_flags)
gcc := $(gcc_path)/bin/$(target)-gcc $(gcc_flags)
-gcjh := $(gcc_path)/bin/gcjh
+gcjh := $(gcc_path)/bin/$(target)-gcjh
as := $(gcc_path)/$(target)/bin/as
ar := $(gcc_path)/$(target)/bin/ar
## Platform-Neutral ###########################################################################
ifneq ($(verbose),true)
-.SILENT: $(cc_objects) $(java_objects) $(java_headers) all bin/org/xwt/builtin.xwar .bootclasspath .javac $(target_bin) compile
+.SILENT: $(cc_objects) $(java_objects) $(java_headers) all bin/org/xwt/builtin.xwar $(target_bin) compile
silent := --silent
endif
-compile: bin/org/xwt/builtin.xwar
+compile: .javac .bootclasspath bin/org/xwt/builtin.xwar
echo "compiling .java -> .class:"
mkdir -p bin
$(shell cat .javac) -classpath lib/libgcj-minimal.jar $(java_sources) -d bin/ 2>&1 | \
platform=Win32 \
target=i686-pc-mingw32 \
target_bin=xwt.exe \
- platform_link="-Wl,--subsystem,windows -lcomdlg32"
+ platform_link="-Wl,--subsystem,windows -lcomdlg32" \
+ platform_java_sources="Win32"
Darwin: upstream
echo -e "\\n=== Darwin ========================================="
this_branch := $(shell tail -c +2 CVS/Tag 2>/dev/null || echo HEAD)
this_branch_flag := $(shell test $(this_branch) = HEAD && echo || echo -r $(this_branch))
-dist:
+# pre-depend on compile as a sanity check
+dist: compile
# this will fail if we haven't checked-in since the comment is null; we want this.
cvs commit -m '' > /dev/null
cvs tag -F xwt-$(current_build)