## Configurables ###########################################################################
# inputs
-javac_java_sources := $(shell find src -name *.java)
-gcj_java_sources := $(shell find src -name *.java \! -path src/org/xwt/plat/\*) src/org/xwt/plat/GCJ.java $(platform_java_sources)
+javac_java_sources := $(shell find src -name \*.java)
+gcj_java_sources := $(shell find src -name \*.java \! -path src/org/xwt/plat/\*) src/org/xwt/plat/GCJ.java $(platform_java_sources)
xwar_sources := $(shell ls src/org/xwt/builtin/*.png src/org/xwt/builtin/*.xwt src/org/xwt/builtin/*.xwf)
cc_sources := src/org/xwt/plat/$(platform).cc
# tools
gcc_path := $(shell pwd)/gcc
-gcc_flags := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls -finline-functions -funroll-loops -g
+#gcc_optimizations := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls -finline-functions -funroll-loops
+gcc_optimizations := -O0
+gcc_flags := $(gcc_optimizations) -g -ffunction-sections -fdata-sections
gcj_flags := -fCLASSPATH=bin
gcj := $(gcc_path)/bin/$(target)-gcj $(gcj_flags) $(gcc_flags)
gcc := $(gcc_path)/bin/$(target)-g++ $(gcc_flags)
-gcjh := $(gcc_path)/bin/gcjh
+gcjh := $(gcc_path)/bin/$(target)-gcjh
ar := $(gcc_path)/$(target)/bin/ar
strip := $(gcc_path)/$(target)/bin/strip
jar := $(shell ((type fastjar &>/dev/null) && echo fastjar) || echo jar)
bin-$(platform)/org/xwt/Trap.o: gcj_flags := -O0 -g
$(gcj_java_objects): bin-$(platform)/%.o: src/%.java $(javac_java_objects)
- echo -ne "compiling .java -> .o: $<"
+ echo "compiling .java -> .o: $<"
mkdir -p `dirname $@`
$(gcj) -c $< -o $@
$(cc_objects): bin-$(platform)/%-nat.o: src/%.cc
- echo -ne "compiling .cc -> .o: $$A"
+ echo "compiling .cc -> .o: $$A"
$(gcc) -Ibin -c $< -o $@
bin-$(platform)/org/xwt/builtin.o: bin/org/xwt/builtin.xwar
echo "archiving .class -> .jar"
mkdir -p bin-Java2
echo -e "Manifest-Version: 1.0\nMain-Class: org.xwt.Main\n" > bin/.manifest
- cd bin; $(jar) cvf ../bin-Java2/xwt.jar -m .manifest \
+ cd bin; $(jar) cvfm ../bin-Java2/xwt.jar .manifest \
org/xwt/builtin.xwar \
`find . -name \*.class | grep -v org/xwt/plat/` \
org/xwt/plat/AWT*.class org/xwt/plat/Java2*.class | tr \\012 \\015
echo "* This build is $(current_build)"
echo "***********************************************************"
- ifeq ($(shell uname -n),gosset.megacz.com)
+ ifeq ($(shell uname -n),serverbeach.megacz.com)
(make $(silent) dist-private 2>&1) >> .make-dist.out || \
(tail -n 200 .make-dist.out | mail -s "Build $(current_build) FAILED" cvs@xwt.org; false)
tail -n 200 .make-dist.out | \