X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=14f3505ee598bca646561fad67735d664110d7ed;hb=98bd62f168ee3d565eb6da9d9ed69ba633d2dc73;hp=e8e1aeb9ea40be9c298fa7e6ee3f5fcdfcc07efd;hpb=6ceff140094edbc5fa919aa17a23c3d00612b458;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index e8e1aeb..14f3505 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,9 @@ Solaris:  ; make gcj platform=Solaris target=sparc-sun-solaris2.7 link_flags="-l
 Win32:    ; make gcj platform=Win32   target=i686-pc-mingw32      link_flags="-Wl,--subsystem,windows -lcomdlg32" target_bin=xwt.exe
 Darwin:   ; make gcj platform=Darwin target=powerpc-apple-darwin link_flags="$(darwin_linker_flags)"
 
+# default
+platform            := JVM
+
 darwin_libdir       := upstream/install/powerpc-apple-darwin/lib
 darwin_linker_flags := -Wl,-dylib_file,/usr/lib/libSystem.B.dylib:$(darwin_libdir)/libSystem.B.dylib
 darwin_linker_flags += -Wl,-dylib_file,/usr/lib/system/libmathCommon.A.dylib:$(darwin_libdir)/libmathCommon.A.dylib
@@ -36,17 +39,23 @@ jar                    := $(shell ((type fastjar &>/dev/null) && echo fastjar) |
 
 include Makefile.upstream
 
-# figure out what stuff in org.xwt.plat.* this platform requires (its superclasses)
+# HACK: FIXME
+ifeq ($(platform),Darwin)
 superclass_org.xwt.plat.Platform:; echo org.xwt.plat.OpenGL
+else
+superclass_org.xwt.plat.Platform:;
+endif
+
+# figure out what stuff in org.xwt.plat.* this platform requires (its superclasses)
 superclass_%: 
 	@echo $*
 	@make -s superclass_org.xwt.plat.$(shell grep extends src/`echo $* | sed s_\\\\._/_g`.java | head -n 1 | sed s_.\*extends\ __ | sed s_\ .\*__)
 
-plat_deps         := $(shell test "$(platform)" = "" || make -s superclass_org.xwt.plat.$(platform) platform= )
-java_sources      := $(patsubst org.xwt.plat.%, build/java/org/xwt/plat/%.java, $(plat_deps))
+all_java_sources  := $(patsubst src/%.java,     build/java/%.java, $(shell find src -name '*.java'))
+java_sources      := $(filter-out build/java/org/xwt/plat/%, $(all_java_sources))
 java_sources      += $(patsubst src/%.java.pp,  build/java/%.java, $(shell find src -name \*.java.pp))
-#java_sources      += build/java/org/xwt/Builtin.java
-java_sources      += $(patsubst src/%.java,     build/java/%.java, $(shell find src -name '*.java' \! -path 'src/org/xwt/plat/*'))
+plat_deps         := $(shell test x$(platform) == x"" || make -s superclass_org.xwt.plat.$(platform) platform= )
+java_sources      += $(patsubst org.xwt.plat.%, build/java/org/xwt/plat/%.java, $(plat_deps))
 
 build/java/%.java: src/%.java ; @echo linking $@; mkdir -p $(@D); ln -s `echo $(@D) | sed 's_[^/]*\(/\|$$\)_../_g'`/$< $@
 build/cc/%.cc:     src/%.c    ; @echo linking $@; mkdir -p $(@D); ln -s `echo $(@D) | sed 's_[^/]*\(/\|$$\)_../_g'`/$< $@
@@ -63,17 +72,17 @@ build/java/%.java: src/%.java.pp
 build/class/%.class: build/java/%.java .jikes
 	@echo -e "\n\033[1mcompiling          .java -> .class: $<\033[0m"
 	mkdir -p build/class
-#	@./.jikes $<
+	@./.jikes $<
 
 compile: .compile
-.compile: $(java_sources)
+.compile: $(java_sources) $(patsubst src/%, build/java/%, $(shell ls src/org/xwt/plat/*.java))
 	@echo -e "\n\033[1mcompiling          .java -> .class: src/**/*.java\033[0m"
 	mkdir -p build/class
-	@./.jikes $(java_sources) build/org/xwt/imp/Freetype.java
+	@./.jikes $^
 	touch .compile
 
 # PHASE 4: gcj-generated headers
-java_headers          := $(java_sources:build/java/%.java=build/h/%.h)
+java_headers          := $(all_java_sources:build/java/%.java=build/h/%.h)
 build/h/%.h: build/class/%.class .compile
 	@echo -e "\n\033[1mextracting        .class -> .h:     $<\033[0m"
 	mkdir -p `dirname $@`
@@ -110,8 +119,7 @@ upstream/jpeg-6b/build-$(target)/libjpeg.a: .install_jpeg-6b_$(target)
 $(target_bin): upstream/jpeg-6b/build-$(target)/libjpeg.a $(java_sources:build/java/%.java=build/$(platform)/%.java.o) build/$(platform)/org/xwt/plat/$(platform).cc.o
 	@echo -e "\n\033[1mlinking               .o -> $(target_bin)\033[0m"
 	mkdir -p build/$(platform)
-	echo "link flags are $(link_flags)"
-	MACOSX_DEPLOYMENT_TARGET=10.2 PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.xwt.Main -o build/$(platform)/$(target_bin) $^ $(jpeg_sources:%.c=upstream/jpeg-6b/build-$(target)/%.o) -Lupstream/install/$(target)/lib $(link_flags)
+	PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.xwt.Main -o build/$(platform)/$(target_bin) $^ $(jpeg_sources:%.c=upstream/jpeg-6b/build-$(target)/%.o) -Lupstream/install/$(target)/lib $(link_flags)
 
 
 ##############################################################################