#############################################################################
#
# The XWT Makefile
-
#
target_Darwin := powerpc-apple-darwin
darwin_linker_flags += -Wl,-dylib_file,$(darwin_ogl_libdir):$(darwin_libdir)/libGLU.dylib
darwin_linker_flags += -lSystem.B -lmathCommon.A -lGL -lGLU
+# stupid broke-ass darwin linker...
+darwin_linker_flags += build/Darwin/org/xwt/plat/OpenGL.java.o build/Darwin/org/xwt/plat/POSIX.java.o
+
target_bin_extension_$(platform) := $(shell echo $(platform) | tr A-Z a-z)
target_bin_extension_Win32 := exe
target_bin_extension_JVM := jar
#gcc_optimizations := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls
#gcc_optimizations += -finline-functions -funroll-loops -ffunction-sections -fdata-sections
-gcc_flags := -nostdinc $(gcc_optimizations) -Ibuild/h -Iupstream/jpeg-6b/src/ -Iupstream/jpeg-6b/build-$(target)
-gcc_flags += -Iupstream/install/$(target)/include -Iupstream/install/lib/gcc-lib/$(target)/3.3/include
-gcc_flags += -Iupstream/install/include -Ibuild/class
-gcj_flags := -fCLASSPATH=build/java
-g++_flags := -Iupstream/install/lib/gcc-lib/$(target)/3.3/include/ -Iupstream/install/$(target)/include -Wno-multichar
-gcj := upstream/install/bin/$(target)-gcj $(gcc_flags) $(gcj_flags)
+gcc_flags := -nostdinc $(gcc_optimizations) -Ibuild/h -Iupstream/jpeg-6b/src -Iupstream/jpeg-6b/build-$(target)
+gcc_flags += -Iupstream/install/lib/gcc-lib/$(target)/3.3/include -Iupstream/install/$(target)/include
+gcj := upstream/install/bin/$(target)-gcj $(gcc_flags) -fCLASSPATH=build/java
gcjh := $(shell pwd)/upstream/install/bin/$(shell test -e upstream/install/bin/$(target)-gcjh && echo $(target)-)gcjh
-g++ := upstream/install/bin/$(target)-gcj $(gcc_flags)
-gcc := upstream/install/bin/$(target)-gcc $(gcc_flags) $(g++_flags)
+g++ := upstream/install/bin/$(target)-gcj $(gcc_flags) -Iupstream/install/include -Wno-multichar
+gcc := upstream/install/bin/$(target)-gcc $(gcc_flags)
jar := $(shell ((type fastjar &>/dev/null) && echo fastjar) || echo jar)
-gcj: .install_gcc-3.3_$(target); make $(target_bin) link_flags="$(link_flags)" platform=$(platform)
+gcj: .install_gcc-3.3_$(target); make build/$(platform)/$(target_bin) link_flags="$(link_flags)" platform=$(platform)
include Makefile.upstream
mkdir -p `dirname $@`
$(g++) -c $< -o $@
-build/$(platform)/$(platform).ar: $(java_sources:build/java/%.java=build/$(platform)/%.java.o)
+nonplat_java_sources := $(filter-out build/java/org/xwt/plat/$(platform).java,$(java_sources))
+build/$(platform)/$(platform).ar: $(nonplat_java_sources:build/java/%.java=build/$(platform)/%.java.o)
@echo -e "\n\033[1marchiving .o -> .a\033[0m"
mkdir -p build/$(platform)
rm -f $@
upstream/install/$(target)/bin/ranlib $@
upstream/jpeg-6b/build-$(target)/libjpeg.a: .install_jpeg-6b_$(target)
-$(target_bin): build/$(platform)/org/xwt/plat/$(platform).cc.o upstream/jpeg-6b/build-$(target)/libjpeg.a build/$(platform)/builtin.o build/$(platform)/$(platform).ar
+build/$(platform)/$(target_bin): build/$(platform)/org/xwt/plat/$(platform).cc.o upstream/jpeg-6b/build-$(target)/libjpeg.a build/$(platform)/builtin.o build/$(platform)/$(platform).ar build/$(platform)/org/xwt/plat/$(platform).java.o
@echo -e "\n\033[1mlinking .o -> $(target_bin)\033[0m"
mkdir -p build/$(platform)
- PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.xwt.Main -o $@ -Lupstream/install/$(target)/lib build/$(platform)/org/xwt/plat/$(platform).java.o $^ $(link_flags)
+ PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.xwt.Main -o $@ -Lupstream/install/$(target)/lib $^ $(link_flags)
### Builtin Resources ##############################################################################
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))
-strip_$(target) := upstream/install/$(target)/bin/strip build/$(platform)/$(target_bin) -o
+strip_$(platform) := upstream/install/$(target)/bin/strip build/$(platform)/$(target_bin) -o
strip_JVM := cp build/$(platform)/$(target_bin)
-install-dist:; $(strip_$(target)) /var/www/master.dist.xwt.org/xwt-$(current_build).$(target_bin_extension).unsigned
+install-dist:; $(strip_$(platform)) /var/www/master.dist.xwt.org/xwt-$(current_build).$(target_bin_extension).unsigned
dist: compile
- ifneq ($(shell uname -n),megacz.com)
- echo "***********************************************************"
- echo "* This build is $(current_build) *"
- echo "***********************************************************"
- cvs commit -m '' > /dev/null # this will fail if we haven't checked-in since the comment is null; we want this.
- echo -e 'cd /home/xwt/\nrm -rf xwt\n/usr/bin/cvs co xwt\nnohup make -C xwt dist 2>&1 >> .make-dist.out &\n' |\
- ssh xwt@xwt.org | grep -v "make...:.\(Entering\|Leaving\).directory"
+ifneq ($(shell uname -n),megacz.com)
+ echo "***********************************************************"
+ echo "* This build is $(current_build) *"
+ echo "***********************************************************"
+ cvs commit -m '' > /dev/null # this will fail if we haven't checked-in since the comment is null; we want this.
+ echo -e 'cd /home/xwt/\nrm -rf xwt\n/usr/bin/cvs -d /cvs co xwt\nnohup make -C xwt dist 2>&1 >> .make-dist.out &\n' |\
+ ssh xwt@xwt.org | grep -v "make...:.\(Entering\|Leaving\).directory"
else
(echo -n 0000; (echo "10k16o16i"; cat next.build | tr a-z A-Z; echo "1+f") | dc) | tail --bytes=5 > next.build-
mv next.build- next.build