## Configurables ###########################################################################
+jpeg_headers := jpeglib.h jconfig.h jmorecfg.h jerror.h jinclude.h jpegint.h jchuff.h jdhuff.h jdct.h jmemsys.h jversion.h
+jpeg_c_sources := jdapimin.c jdapistd.c jcomapi.c jcparam.c jdmaster.c jdinput.c jdmainct.c jdcoefct.c jdpostct.c jdmarker.c
+jpeg_c_sources += jdhuff.c jdphuff.c jddctmgr.c jidctint.c jidctfst.c jidctflt.c jidctred.c jdsample.c jdcolor.c jdmerge.c
+jpeg_c_sources += jquant1.c jquant2.c jerror.c jutils.c jmemnobs.c jmemmgr.c
+
# inputs
-javac_java_sources := $(shell find src -name \*.java)
+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
+c_sources := $(jpeg_c_sources:%.c=src/org/ijg/%.c)
# outputs
-javac_java_objects := $(javac_java_sources:src/%.java=bin/%.class)
-cc_objects := $(cc_sources:src/%.cc=bin-$(platform)/%-nat.o)
-gcj_java_objects := $(gcj_java_sources:src/%.java=bin-$(platform)/%.o)
+java_classes := $(java_sources:src/%.java=bin/%.class)
+java_objects := $(gcj_java_sources:src/%.java=bin-$(platform)/%.java.o)
+cc_objects := $(cc_sources:src/%.cc=bin-$(platform)/%.cc.o)
+c_objects := $(c_sources:src/%.c=bin-$(platform)/%.c.o)
# 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
+debug :=
+gcc_flags := $(gcc_optimizations) $(debug) -ffunction-sections -fdata-sections -Isrc/org/ijg
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
+g++ := $(gcc_path)/bin/$(target)-g++ $(gcc_flags)
+gcc := $(gcc_path)/bin/$(target)-gcc $(gcc_flags)
+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)
## Platform-Neutral ###########################################################################
ifneq ($(verbose),true)
-.SILENT: $(javac_java_objects) .headers $(gcj_java_objects) $(all_platforms) bin/org/xwt/builtin.xwar .bootclasspath .javac
+.SILENT: $(java_classes) .headers $(java_objects) $(all_platforms) bin/org/xwt/builtin.xwar .bootclasspath .javac
silent := --silent
endif
-compile: $(javac_java_objects) bin/org/xwt/builtin.xwar
+compile: $(java_classes) bin/org/xwt/builtin.xwar
all: $(all_platforms)
cd jikes-1.18; ./configure --prefix=`pwd` && make && make install
ln -sf jikes-1.18/bin/jikes .jikes
-$(javac_java_objects): $(javac_java_sources) .javac
+$(java_classes): $(java_sources) .javac
test "$(JAVA_HOME)"x != x || (echo "you forgot to set your JAVA_HOME environment variable"; false)
- echo "compiling .java -> .class:"
+ echo "compiling .java -> .class:"
mkdir -p bin
- $(shell cat .javac) -classpath lib/libgcj-minimal.jar $(javac_java_sources) -d bin/
- echo "compiling .java -> .class: done"
+ $(shell cat .javac) -classpath lib/libgcj-minimal.jar $(java_sources) -d bin/
+ echo "compiling .java -> .class: done"
bin/org/xwt/builtin.xwar: $(xwar_sources)
mkdir -p bin/org/xwt
gcj: compile $(gcc_path)/bin/$(target)-gcj .headers link
-link: $(gcj_java_objects) $(cc_objects) bin-$(platform)/org/xwt/builtin.o
- echo "linking .o -> $(target_bin)"
+link: $(java_objects) $(cc_objects) $(c_objects) bin-$(platform)/org/xwt/builtin.o
+ echo "linking .o -> $(target_bin)"
$(ar) r bin-$(platform)/org/xwt/plat/platform.ar bin-$(platform)/org/xwt/plat/*.o
- $(gcj) --main=org.xwt.Main -o bin-$(platform)/$(target_bin) $^ $(platform_link) bin-$(platform)/org/xwt/plat/platform.ar
+ $(gcj) --main=org.xwt.Main -o bin-$(platform)/$(target_bin) $^ -lstdc++ $(platform_link) bin-$(platform)/org/xwt/plat/platform.ar
-.headers: $(javac_java_objects)
+.headers: $(java_classes)
cd bin; for A in `find * -name \*.class`; do \
echo "extracting .class -> .h: $$A"; \
$(gcjh) --classpath . `echo $$A | sed s_/_._g | sed s/.class$$//`; \
# turn off optimization of Trap.java due to a compiler bug
bin-$(platform)/org/xwt/Trap.o: gcj_flags := -O0 -g
-$(gcj_java_objects): bin-$(platform)/%.o: src/%.java $(javac_java_objects)
- echo "compiling .java -> .o: $<"
- mkdir -p `dirname $@`
+# unpack and patch the ijg library
+src/org/ijg/jmorecfg.h: src/org/ijg/jpegsrc.v6b.tar.gz src/org/ijg/jmorecfg.h.patch
+ cd src/org/ijg/; tar xzf jpegsrc.v6b.tar.gz
+ cd src/org/ijg/jpeg-6b; ./configure --target=$(target)
+ cd src/org/ijg/jpeg-6b; mv $(jpeg_c_sources) $(jpeg_headers) ..
+ cd src/org/ijg; patch -p0 < jmorecfg.h.patch
+ rm -rf src/org/ijg/jpeg-6b
+
+$(java_objects): bin-$(platform)/%.java.o: src/%.java $(java_classes)
+ @echo "compiling .java -> .o: $<"
+ @mkdir -p `dirname $@`
$(gcj) -c $< -o $@
-$(cc_objects): bin-$(platform)/%-nat.o: src/%.cc
- echo "compiling .cc -> .o: $$A"
+$(cc_objects): bin-$(platform)/%.cc.o: src/%.cc src/org/ijg/jmorecfg.h
+ @echo "compiling .cc -> .o: $<"
+ @mkdir -p `dirname $@`
+ $(g++) -Ibin -c $< -o $@
+
+$(c_objects): bin-$(platform)/%.c.o: src/%.c src/org/ijg/jmorecfg.h
+ @echo "compiling .c -> .o: $<"
+ @mkdir -p `dirname $@`
$(gcc) -Ibin -c $< -o $@
bin-$(platform)/org/xwt/builtin.o: bin/org/xwt/builtin.xwar
- echo "wrapping .xwar -> .o"
+ @echo "wrapping .xwar -> .o"
$(gcj) --resource org/xwt/builtin.xwar -c $< -o $@
platform_link="-Wl,--subsystem,windows -lcomdlg32" \
platform_java_sources=src/org/xwt/plat/Win32.java
-Java2: $(javac_java_objects) bin/org/xwt/builtin.xwar
+Java2: $(java_classes) bin/org/xwt/builtin.xwar
echo -e "\\n=== Java2 ========================================="
- echo "archiving .class -> .jar"
+ 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) cvfm ../bin-Java2/xwt.jar .manifest \
current_build := $(shell cat next.build)
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:
# this will fail if we haven't checked-in since the comment is null; we want this.
tail -n 200 .make-dist.out | \
mail -s "Unsigned binaries of $(current_build) are now available" cvs@xwt.org
else
- ssh xwt@xwt.org verbose=$(verbose) /home/xwt/dist $(this_branch) \
+ ssh xwt@xwt.org verbose=$(verbose) /home/xwt/dist $(this_branch_flag) \
| grep -v "make...:.\(Entering\|Leaving\).directory"
endif
projects / org.ibex.core.git / blobdiff