X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=8a9f8f7018c74c6e55ce683cd0706aeb50396e4b;hb=c61eeb4940974998d885d5f56e135436b370e872;hp=862e1f34c890b5b35b5a270e79c50e49f20f0fb7;hpb=6f6a7fea7232c364a46839b5a189bcc53a8b2865;p=org.ibex.core.git diff --git a/Makefile b/Makefile index 862e1f3..8a9f8f7 100644 --- a/Makefile +++ b/Makefile @@ -3,14 +3,13 @@ # The XWT Makefile # -all: JVM Linux Win32 Carbon Java2 #Solaris +all: JVM Darwin Linux Win32 Solaris JVM: build/JVM/xwt.jar -Linux: ; make gcj platform=Linux target=i686-pc-linux-gnu platform_link="-lX11 -lXext --static" -Solaris: ; make gcj platform=Solaris target=sparc-sun-solaris2.7 platform_link="-lX11 -lXext" -Win32: ; make gcj platform=Win32 target=i686-pc-mingw32 target_bin=xwt.exe platform_link="-Wl,--subsystem,windows -lcomdlg32" -Carbon: ; make gcj platform=Carbon target=powerpc-apple-darwin \ - platform_link=-Wl,-framework,Carbon,-framework,OpenGL,-framework,AGL,-framework,SystemConfiguration +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="-lSystem -lmathCommon.A" ############################################################################# @@ -18,70 +17,47 @@ Carbon: ; make gcj platform=Carbon target=powerpc-apple-darwin \ # target_bin := xwt.$(shell echo $(platform) | tr A-Z a-z) jikes_flags := -nowarn -sourcepath src/ -gcc_path := upstream/install gcc_optimizations := -O2 #gcc_optimizations := -O9 -ffast-math -fomit-frame-pointer -foptimize-sibling-calls #gcc_optimizations += -finline-functions -funroll-loops -ffunction-sections -fdata-sections -gcc_flags := $(gcc_optimizations) -Ibuild/h -Iupstream/jpeg-6b/src/ -gcj_flags += -fCLASSPATH=build/java -gcj := $(gcc_path)/bin/$(target)-gcj $(gcc_flags) $(gcj_flags) -g++ := $(gcc_path)/bin/$(target)-g++ $(gcc_flags) -gcc := $(gcc_path)/bin/$(target)-gcc $(gcc_flags) +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) +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) - - -############################################################################# -# Overview: -# -# The Makefile has been divided into phases; each phase depends on the -# previous one. Subphases of the same phase (ie 1a, 1b) are not -# interdependent. You can think of the build process as proceeding -# through the phases in order, but processing subphases within a given -# phase in any order. -# - -# PHASE 1a: upstream code and how to fetch it include Makefile.upstream + +# FIXME this should be done with -ljpeg 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 -upstream/jpeg-6b/src/%.c: download_jpeg-6b - -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 - -# PHASE 1b: human-written inputs 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 += $(patsubst src/%.mips.c, build/java/%.java, $(shell find src -name \*.mips.c)) java_sources += build/java/org/xwt/Builtin.java -# PHASE 2: ready-to-compile java files (either symlinked to phase 1a sources or else generated from them) 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 build/class/org/xwt/util/Preprocessor.class +build/java/%.java: src/%.java.pp + @make -s build/class/org/xwt/util/Preprocessor.class @echo -e "\n\033[1mpreprocessing .java.pp -> .java: $<\033[0m" mkdir -p `dirname $@` rm -f $@ java -cp build/class org.xwt.util.Preprocessor < $< > $@ -# PHASE 3: class files build/class/%.class: build/java/%.java .jikes @echo -e "\n\033[1mcompiling .java -> .class: $<\033[0m" mkdir -p build/class @./.jikes $< compile: .compile -.compile: $(java_sources) +.compile: $(java_sources:build/java/%.c=build/class/%.class) @echo -e "\n\033[1mcompiling .java -> .class: src/**/*.java\033[0m" mkdir -p build/class @./.jikes $(java_sources) @@ -93,18 +69,23 @@ 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 ../../$(gcc_path)/bin/gcjh -d ../h --classpath .) + sed s_build/class/__ | sed s/.class\$$//g | sed s_/_._g | (cd build/class; xargs ../../upstream/install/bin/$(target)-gcjh -d ../h --classpath .) + +# a hack since we've disabled gcj's awt implementation +build/$(platform)/org/xwt/plat/Java2.java.o: + touch .empty.c; mkdir -p $(@D); $(gcc) -c .empty.c -o $@; +build/$(platform)/org/xwt/plat/AWT.java.o: + touch .empty.c; mkdir -p $(@D); $(gcc) -c .empty.c -o $@; -# PHASE 4: object files build/$(platform)/%.java.o: build/java/%.java @echo -e "\n\033[1mcompiling .java -> .o: $<\033[0m" mkdir -p `dirname $@` $(gcj) -c $< -o $@ -build/$(platform)/org/xwt/plat/$(platform).cc.o: src/org/xwt/plat/*.cc $(java_headers) +build/$(platform)/org/xwt/plat/$(platform).cc.o: src/org/xwt/plat/$(platform).cc src/org/xwt/plat/*.cc $(java_headers) .configure_jpeg-6b_$(target) @echo -e "\n\033[1mcompiling .cc -> .o: $<\033[0m" mkdir -p `dirname $@` - $(g++) -I/usr/X11R6/include/ -I$(gcc_path)/include -Ibuild/h -Iupstream/$(platform)/include -Wno-multichar -c $< -o $@ + $(g++) -Iupstream/install/lib/gcc-lib/$(target)/3.3/include/ -Iupstream/install/$(target)/include -I/usr/X11R6/include/ -Ibuild/h -Wno-multichar -Iupstream/install/include -c $< -o $@ build/$(platform)/jpeg-6b/%.c.o: upstream/jpeg-6b/src/%.c @echo -e "\n\033[1mcompiling .c -> .o: $<\033[0m" @@ -112,22 +93,23 @@ build/$(platform)/jpeg-6b/%.c.o: upstream/jpeg-6b/src/%.c $(gcc) -Ibuild/h -c $< -o $@ # PHASE 5: linking -$(target_bin).ar: $(java_object_files) build/$(platform)/org/xwt/plat/$(platform).cc.o $(jpeg_object_files) +build/$(target)/$(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 - $(ar) -c $(target_bin).ar $^ + rm -f build/$(target)/$(target_bin).ar + upstream/install/$(target)/bin/ar -cq build/$(target)/$(target_bin).ar $^ + upstream/install/$(target)/bin/ranlib build/$(target)/$(target_bin).ar -$(target_bin): $(target_bin).ar +$(target_bin): build/$(target)/$(target_bin).ar @echo -e "\n\033[1mlinking .o -> $(target_bin)\033[0m" mkdir -p build/$(platform) - $(gcj) --main=org.xwt.Main -o build/$(platform)/$(target_bin) $(target_bin).ar -L$(gcc_path)/lib $(platform_link) + PATH=upstream/install/bin:$$PATH $(gcj) --main=org.xwt.Main -o build/$(platform)/$(target_bin) build/$(target)/$(target_bin).ar -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) +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 @@ -138,52 +120,49 @@ build/java/org/xwt/Builtin.java:: $(shell ls src/org/xwt/builtin/*.png src/org/x sed 's_\(.+\)_"\1" +_' >> ../build/java/org/xwt/Builtin.java echo "\"\"; }" >> build/java/org/xwt/Builtin.java -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 -build/mips/%.o: src/org/xwt/imp/%.c $(gcc_path)/bin/mips-gcc upstream/.freetype - @mkdir -p build/mips +# 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 + @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`; + + + +############################################################################## +# Freetype +# + +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" - $(gcc_path)/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: $(gcc_path)/bin/mips-gcc build/mips/crt0.o build/mips/syscalls.o build/mips/Freetype.o upstream/.freetype-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 - make -sC upstream newlib-1.11.0/src newlib-1.11.0/build-mips/.installed freetype-2.1.4/src target=mips - $(gcc_path)/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 - -############################################################################## -# Supported Platforms: -# - -# 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: $(gcc_path)/bin/$(target)-gcj compile $(target_bin) -build/JVM/xwt.jar:.compile - @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 | grep -v org/xwt/plat/` \ - org/xwt/plat/AWT*.class org/xwt/plat/Java2*.class - echo - +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 @@ -282,20 +261,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