X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=73093feed69e62870dd2ec8e8310ad890b787c89;hb=cbf3213acd633866b3e686358d3eb3d7f657cd4a;hp=f3e1e355e374a4632a16d91cc6c00cce0df454b0;hpb=80e82433fb92366d007d63d4ba44b25dfa9f4425;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index f3e1e35..73093fe 100644
--- a/Makefile
+++ b/Makefile
@@ -3,13 +3,23 @@
 # The XWT Makefile
 #
 
-all:      JVM Linux Win32 Darwin Java2 Solaris
+all:      JVM Darwin Linux Win32 Solaris
 
 JVM:        build/JVM/xwt.jar
 Linux:    ; make gcj platform=Linux   target=i686-pc-linux-gnu    link_flags="-lX11 -lXext --static"
 Solaris:  ; make gcj platform=Solaris target=sparc-sun-solaris2.7 link_flags="-lX11 -lXext"
 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="-lgcj -lSystem -lgcc -lmathCommon.A upstream/install/powerpc-apple-darwin/lib/crt1.o"
+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
+darwin_linker_flags += -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:$(darwin_libdir)/libGL.dylib
+darwin_linker_flags += -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLU.dylib:$(darwin_libdir)/libGLU.dylib
+darwin_linker_flags += -lSystem.B -lmathCommon.A -lGL -lGLU
 
 
 #############################################################################
@@ -23,36 +33,40 @@ gcc_optimizations      := -O2
 gcc_flags              := -nostdinc $(gcc_optimizations) -Ibuild/h -Iupstream/jpeg-6b/src/ -Iupstream/jpeg-6b/build-$(target)/
 gcj_flags              := -fCLASSPATH=build/java
 gcj                    := upstream/install/bin/$(target)-gcj $(gcc_flags) $(gcj_flags)
+gcjh                   := $(shell test -e `pwd`/upstream/install/bin/$(target)-gcjh && echo `pwd`/upstream/install/bin/$(target)-gcjh || echo `pwd`/upstream/install/bin/gcjh)
 g++                    := upstream/install/bin/$(target)-gcj $(gcc_flags)
 gcc                    := upstream/install/bin/$(target)-gcc $(gcc_flags)
 jar                    := $(shell ((type fastjar &>/dev/null) && echo fastjar) || echo jar)
 
+include Makefile.upstream
 
+# figure out what stuff in org.xwt.plat.* this platform requires (its superclasses)
+superclass_%: 
+	@echo $(patsubst org.xwt.plat.%, build/java/org/xwt/plat/%.java, $*)
+	@make -s superclass_org.xwt.plat.$(shell grep extends src/`echo $* | sed s_\\\\._/_g`.java | head -n 1 | sed s_.\*extends\ __ | sed s_\ .\*__)
 
-include Makefile.upstream
-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
-upstream/jpeg-6b/src/%.c: .download_jpeg-6b
+all_java_sources  := $(patsubst src/%.java,     build/java/%.java, $(shell find src -name '*.java'))
+all_java_sources  += $(patsubst src/%.java.pp,  build/java/%.java, $(shell find src -name '*.java.pp'))
+
+superclass_org.xwt.plat.Platform:;
+ifneq ($(platform),)
+plat_deps         := $(shell make -s superclass_org.xwt.plat.$(platform) platform= )
+endif
 
-freetype_sources    := ftsystem.c ftmm.c ftbbox.c ftinit.c ftdebug.c ftbase.c ftglyph.c smooth.c sfnt.c truetype.c
-upstream/freetype-2.1.4/%.c: .download_freetype-2.1.4
+# HACK: FIXME
+ifeq ($(platform),Darwin)
+plat_deps         += build/java/org/xwt/plat/OpenGL.java
+endif
 
-java_sources      := $(patsubst src/%.java,    build/java/%.java, $(shell find src -name \*.java))
-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      := $(filter-out build/java/org/xwt/plat/%, $(all_java_sources)) $(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'`/$< $@
 build/c/jpeg/%.c:     upstream/jpeg-6b/src/%.c
 	@echo linking $@; mkdir -p $(@D); ln -s `echo $(@D) | sed 's_[^/]*\(/\|$$\)_../_g'`/$< $@
-build/c/freetype/%.c: upstream/freetype-2.1.4/src/base/%.c
-	@echo linking $@; mkdir -p $(@D); ln -s `echo $(@D) | sed 's_[^/]*\(/\|$$\)_../_g'`/$< $@
-build/c/freetype/%.c: upstream/freetype-2.1.4/src/%/%.c
-	@echo linking $@; mkdir -p $(@D); ln -s `echo $(@D) | sed 's_[^/]*\(/\|$$\)_../_g'`/$< $@
 
 build/java/%.java: src/%.java.pp
-	@make -s build/class/org/xwt/util/Preprocessor.class
+	make build/class/org/xwt/util/Preprocessor.class
 	@echo -e "\n\033[1mpreprocessing   .java.pp -> .java:  $<\033[0m"
 	mkdir -p `dirname $@`
 	rm -f $@
@@ -64,19 +78,19 @@ build/class/%.class: build/java/%.java .jikes
 	@./.jikes $<
 
 compile: .compile
-.compile: $(java_sources:build/java/%.c=build/class/%.class)
+.compile: $(all_java_sources)
 	@echo -e "\n\033[1mcompiling          .java -> .class: src/**/*.java\033[0m"
 	mkdir -p build/class
-	@./.jikes $(java_sources)
+	@./.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 $@`
 	ls `echo $< | sed s/.class\$$//`*.class |\
-		 sed s_build/class/__ | sed s/.class\$$//g | sed s_/_._g | (cd build/class; xargs ../../upstream/install/bin/$(target)-gcjh -d ../h --classpath .)
+		 sed s_build/class/__ | sed s/.class\$$//g | sed s_/_._g | (cd build/class; xargs $(gcjh) -d ../h --classpath .)
 
 # a hack since we've disabled gcj's awt implementation
 build/$(platform)/org/xwt/plat/Java2.java.o:
@@ -100,42 +114,60 @@ build/$(platform)/jpeg-6b/%.c.o: upstream/jpeg-6b/src/%.c
 	$(gcc) -Ibuild/h -c $< -o $@
 
 # PHASE 5: linking
-$(target_bin).ar: $(java_sources:build/java/%.java=build/$(platform)/%.java.o) build/$(platform)/org/xwt/plat/$(platform).cc.o $(jpeg_object_files)
-	@echo -e "\n\033[1marchiving             .o -> $(target_bin).ar\033[0m"
-	rm -f $(target_bin).ar
-	upstream/install/$(target)/bin/ar -cq $(target_bin).ar $^
-	upstream/install/$(target)/bin/ranlib $(target_bin).ar
+jpeg_sources    := jdapimin.c jdapistd.c jcomapi.c jcparam.c jdmaster.c jdinput.c jdmainct.c jdcoefct.c jdpostct.c jdmarker.c
+jpeg_sources    += jdhuff.c jdphuff.c jddctmgr.c jidctint.c jidctfst.c jidctflt.c jidctred.c jdsample.c jdcolor.c jdmerge.c
+jpeg_sources    += jquant1.c jquant2.c jerror.c jutils.c jmemnobs.c jmemmgr.c
 
-$(target_bin): $(target_bin).ar
+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 build/$(platform)/org/xwt/builtin.res.o build/$(platform)/freetype.res.o
 	@echo -e "\n\033[1mlinking               .o -> $(target_bin)\033[0m"
 	mkdir -p build/$(platform)
-	PATH=upstream/install/bin:$$PATH $(gcj) -nostdlib --main=org.xwt.Main -o build/$(platform)/$(target_bin) $(target_bin).ar -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)
 
 
 ##############################################################################
 # Special treatment:
 #
 
-build/java/org/xwt/Builtin.java: $(shell ls src/org/xwt/builtin/*.png src/org/xwt/builtin/*.xwt src/org/xwt/builtin/*.xwf)
-	@mkdir -p `dirname $@` build build/java build/class build/h build
-	echo -e "\n\033[1mzipping/uuencoding  .xwt -> .java:  build/java/org/xwt/Builtin.java\033[0m"
-	echo "package org.xwt;"                  >  build/java/org/xwt/Builtin.java
-	echo "class Builtin {"                   >> build/java/org/xwt/Builtin.java
-	echo "public static String encoded = "   >> build/java/org/xwt/Builtin.java
-	cd src; $(jar) cf - $(<:src/%=%) | \
-		uuencode foo | tail -n +2 | grep -v '^end$$' | grep -v '^`$$' | \
-		sed 's_\(.+\)_"\1" +_' >> ../build/java/org/xwt/Builtin.java
-	echo "\"\"; }"                           >> build/java/org/xwt/Builtin.java
+build/xwar/org/xwt/builtin.xwar: $(shell ls src/org/xwt/builtin/*.*)
+	@echo -e "\n\033[1mzipping                * -> .xwar: builtin.xwar\033[0m"
+	mkdir -p build/xwar
+	cd src; $(jar) cvf ../build/xwar/builtin.xwar org/xwt/builtin
+
+build/$(platform)/org/xwt/builtin.res.o: build/xwar/org/xwt/builtin.xwar
+	@echo -e "\n\033[1mwrapping           .xwar -> .o: builtin.res.o\033[0m"
+	@(echo "unsigned int builtin_xwar_length = ";                           \
+		(wc -c build/xwar/builtin.xwar | sed "s_build.*__");            \
+		echo \;;                                                        \
+		echo "unsigned char builtin_xwar[] = {";                        \
+		hexdump -ve '"0x" 1/1 "%x,\n"' build/xwar/builtin.xwar;         \
+		echo "};") > .builtin.c
+	$(gcc) -c .builtin.c -o build/$(platform)/org/xwt/builtin.res.o
+
+build/$(platform)/freetype.res.o: build/mips/freetype.mips
+	@echo -e "\n\033[1mwrapping           .mips -> .o: freetype.res.o\033[0m"
+	@(echo "unsigned int freetype_mips_length = ";                           \
+		(wc -c build/mips/freetype.mips | sed "s_build.*__");            \
+		echo \;;                                                         \
+		echo "unsigned char freetype_mips[] = {";                        \
+		hexdump -ve '"0x" 1/1 "%x,\n"' build/mips/freetype.mips;         \
+		echo "};") > .freetype.c
+	$(gcc) -c .freetype.c -o build/$(platform)/freetype.res.o
 
 
 # compile is here to force compilation of the .class files (they get used via -Ibuild) without
 # having the individual .o's depend on the .java's (otherwise every .o gets recompiled when one .java changes)
-gcj: .vendor .install_gcc-3.3_$(target) .compile $(target_bin)
-build/JVM/xwt.jar: .compile
+gcj: .compile .vendor .install_gcc-3.3_$(target) $(target_bin)
+
+build/JVM/xwt.jar: .compile build/xwar/builtin.xwar build/mips/freetype.mips
 	@echo -e "\n\033[1marchiving         .class -> .jar:   build/JVM/xwt.jar\033[0m"
 	mkdir -p build/JVM
 	echo -e "Manifest-Version: 1.0\nMain-Class: org.xwt.Main\n" > build/JVM/.manifest
-	cd build/class; $(jar) cfm ../JVM/xwt.jar ../JVM/.manifest `find . -name \*.class`;
+	cd build/class/org/xwt/; ln -fs ../../../xwar/builtin.xwar  # HACK
+	cd build/class/org/xwt/; ln -fs ../../../mips/freetype.mips         # HACK
+	cd build/class; $(jar) cfm ../JVM/xwt.jar ../JVM/.manifest `find .`;
+	rm build/class/org/xwt/builtin.xwar
+	rm build/class/org/xwt/freetype.mips
 
 
 
@@ -143,32 +175,28 @@ build/JVM/xwt.jar: .compile
 # Freetype
 #
 
-build/mips/%.c.o: build/c/freetype/%.c install_freetype-2.1.4
-	make -s install_gcc-3.3 target=mips
-	mkdir -p build/mips
+build/mips/%.c.o: src/%.c
+	make .install_freetype-2.1.4_mips-unknown-elf target=mips-unknown-elf
+	mkdir -p $(@D)
 	echo -e "\n\033[1mcompiling $< -> $@ (mips)\033[0m"
-	upstream/install/bin/mips-gcc -march=mips1 -I upstream/freetype-2.1.4/include -c -o $@ $<
+	upstream/install/bin/mips-unknown-elf-gcc -march=r3000 -I upstream/freetype-2.1.4/src/include -c -o $@ $<
 
-build/mips/freetype.mips: $(freetype_sources:%.c=build/mips/%.c.o)
-	make -s install_newlib-1.11.0 target=mips
-	@echo -e "\n\033[1mcompiling             .c -> .mips:  $@\033[0m"
+build/mips/freetype.mips: build/mips/org/xwt/imp/Freetype.c.o build/mips/org/xwt/imp/crt0.c.o build/mips/org/xwt/imp/syscalls.c.o
+	make .install_freetype-2.1.4_mips-unknown-elf target=mips-unknown-elf
+	@echo -e "\n\033[1mlinking               .o -> .mips:  $@\033[0m"
 	mkdir -p build/mips
-	upstream/install/bin/mips-gcc \
+	upstream/install/bin/mips-unknown-elf-gcc \
 		-nostdlib \
 		--static \
 		-march=mips1 \
 		-T src/org/xwt/imp/linker.ld \
 		-Lbuild/mips \
-		-Lupstream/freetype-2.1.4/objs \
+		-Lupstream/freetype-2.1.4/src/objs \
 		-o $@ \
-		build/mips/Freetype.o \
+		build/mips/org/xwt/imp/Freetype.c.o \
+		--strip \
 		-lfreetype
 
-build/java/org/xwt/imp/Freetype.java: build/mips/freetype.mips build/class/org/xwt/imp/MIPS.class
-	@echo -e "\n\033[1mtranslating        .mips -> .java:  $@\033[0m"
-	mkdir -p build/java/org/xwt/imp/
-	rm -f $@
-	java -cp build/class org.xwt.imp.MIPS org.xwt.imp.Freetype build/mips/freetype.mips > build/java/org/xwt/imp/Freetype.java
 
 
 
@@ -267,20 +295,3 @@ dist-private:
 
 	echo
 	echo "*** DONE ******************************************"
-
-
-
-
-
-
-
-#mips: $(prefix)/mips/lib/libm.a
-#$(prefix)/mips/lib/libm.a: src/.newlib $(prefix)/bin/mips-gcc
-#	mkdir -p build/$(target)/newlib
-#	cd build/$(target)/newlib; PATH=$(prefix)/bin:$$PATH \
-#		../../../src/newlib-1.11.0/configure --nfp --enable-multilib --prefix=$(prefix) --target=mips
-#	cd build/$(target)/newlib; PATH=$(prefix)/bin:$$PATH EXTRA_CFLAGS=-mstrict-align make
-#	cd build/$(target)/newlib; make install
-# FIXME: this is probably going to cause problems... figure out how to get by without it
-#	touch .empty.c
-#	$(prefix)/bin/mips-gcc -c .empty.c -o $(prefix)/mips/lib/crt0.o