X-Git-Url: http://git.megacz.com/?p=org.ibex.core.git;a=blobdiff_plain;f=Makefile;h=cf3873209ecd5ec12368ea62120a0b25938f1838;hp=3334950f4424586618aae970b70f1d71fd482a0e;hb=36b17515a42e468be7db1346384ce98df3e30882;hpb=d674a01d6f4685821c46df6bb8ccf6f1e34d23fa

diff --git a/Makefile b/Makefile
index 3334950..cf38732 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,12 @@
 
 #
 
+target_Darwin := powerpc-apple-darwin
+target_Win32  := i686-pc-mingw32
+target_Solaris := sparc-sun-solaris2.7
+target_Linux := i686-pc-linux-gnu
+target := $(target_$(platform))
+
 all:         JVM Linux Win32 Darwin Solaris
 
 clean:      ; rm -rf build
@@ -18,9 +24,6 @@ Solaris:  ; make gcj platform=Solaris link_flags="-lX11 -lXext -lpthread"
 Win32:    ; make gcj platform=Win32   link_flags="-Wl,--subsystem,windows -lcomdlg32"
 Darwin:   ; make gcj platform=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
@@ -29,18 +32,20 @@ darwin_linker_flags += -Wl,-dylib_file,$(darwin_ogl_libdir)/libGL.dylib:$(darwin
 darwin_linker_flags += -Wl,-dylib_file,$(darwin_ogl_libdir):$(darwin_libdir)/libGLU.dylib
 darwin_linker_flags += -lSystem.B -lmathCommon.A -lGL -lGLU
 
-target_bin_extension_$(platform) := (shell echo $(platform) | tr A-Z a-z)
+target_bin_extension_$(platform) := $(shell echo $(platform) | tr A-Z a-z)
 target_bin_extension_Win32       := exe
 target_bin_extension_JVM         := jar
-target_bin_extension             := target_bin_extension_$(target)
+target_bin_extension             := $(target_bin_extension_$(platform))
 target_bin                       := xwt.$(target_bin_extension)
 
-jikes_flags        := -nowarn -sourcepath src/
+jikes_flags        := -nowarn
 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          := -nostdinc $(gcc_optimizations) -Ibuild/h -Iupstream/jpeg-6b/src/ -Iupstream/jpeg-6b/build-$(target)/
+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
 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)
@@ -49,12 +54,6 @@ g++                := upstream/install/bin/$(target)-gcj $(gcc_flags)
 gcc                := upstream/install/bin/$(target)-gcc $(gcc_flags) $(g++_flags)
 jar                := $(shell ((type fastjar &>/dev/null) && echo fastjar) || echo jar)
 
-target_Darwin := powerpc-apple-darwin
-target_Win32  := i686-pc-mingw32
-target_Solaris := sparc-sun-solaris2.7
-target_Linux := i686-pc-linux-gnu
-target := $(target_$(platform))
-
 gcj: .install_gcc-3.3_$(target); make $(target_bin) link_flags="$(link_flags)" platform=$(platform)
 
 include Makefile.upstream
@@ -89,7 +88,7 @@ build/class/org/xwt/util/Preprocessor.class: src/org/xwt/util/Preprocessor.java
 
 oldcompile:; CLASSPATH=$$CLASSPATH:lib/libgcj-minimal.jar:upstream/mips/build javac -d build/class `find build/java/ -name \*.java`
 compile: .compile
-.compile: $(java_sources) .jikes 
+.compile: $(java_sources) .jikes .install_mips2java
 	@echo -e "\n\033[1mcompiling          .java -> .class: src/**/*.java\033[0m"
 	@rm -f $(java_sources:build/java/%.java=build/class/%.class)
 	mkdir -p build/class