fixed bug 460

[org.ibex.core.git] / Makefile

diff --git a/Makefile b/Makefile
index 4e9dc64..6752dc4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,9 +17,17 @@ dist-clean:
        find upstream -name config.cache -exec rm {} \;
        test -e upstream/mips && make -C upstream/mips clean
 
+libwing_Linux := -Lupstream/install/i686-pc-linux-gnu/lib/
+libwing_Linux +=   upstream/install/i686-pc-linux-gnu/lib/libWINGs.a
+libwing_Linux +=   upstream/install/i686-pc-linux-gnu/lib/libwraster.a
+
+libwing_Solaris := -Lupstream/install/sparc-sun-solaris2.7/lib/
+libwing_Solaris +=   upstream/install/sparc-sun-solaris2.7/lib/libWINGs.a
+libwing_Solaris +=   upstream/install/sparc-sun-solaris2.7/lib/libwraster.a
+
 JVM:        build/JVM/ibex.jar
-Linux:    ; make gcj platform=Linux   link_flags="-lX11 -lXext"
-Solaris:  ; make gcj platform=Solaris link_flags="-lX11 -lXext -lpthread"
+Linux:    ; make gcj platform=Linux   link_flags="$(libwing_Linux) -lXpm -lX11 -lXext"
+Solaris:  ; make gcj platform=Solaris link_flags="$(libwing_Solaris) -lXpm -lX11 -lXext -lpthread"
 Win32:    ; make gcj platform=Win32   link_flags="-Wl,--subsystem,windows -lcomdlg32"
 Darwin:   ; make gcj platform=Darwin  link_flags="$(darwin_linker_flags)"
 
@@ -167,6 +175,10 @@ build/$(platform)/%.java.o: build/java/%.java
        mkdir -p `dirname $@`
        $(gcj) -c $< -o $@
 
+# FIXME detect subclasses of X11
+build/$(platform)/org/ibex/plat/Linux.cc.o: .install_WindowMaker-0.80.2_$(target) 
+build/$(platform)/org/ibex/plat/Solaris.cc.o: .install_WindowMaker-0.80.2_$(target) 
+
 build/$(platform)/org/ibex/plat/$(platform).cc.o: src/org/ibex/plat/$(platform).cc src/org/ibex/plat/*.cc .configure_jpeg-6b_$(target)
        @make $(java_headers)
        @echo -e "\n\033[1mcompiling            .cc -> .o:     $<\033[0m"
@@ -182,10 +194,11 @@ build/$(platform)/$(platform).ar: $(nonplat_java_sources:build/java/%.java=build
        upstream/install/$(target)/bin/ranlib $@
 
 upstream/jpeg-6b/build-$(target)/libjpeg.a: .install_jpeg-6b_$(target)
+
 build/$(platform)/$(target_bin): build/$(platform)/org/ibex/plat/$(platform).cc.o upstream/jpeg-6b/build-$(target)/libjpeg.a build/$(platform)/builtin.o build/$(platform)/$(platform).ar build/$(platform)/org/ibex/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.ibex.Main -o $@ -Lupstream/install/$(target)/lib $^ $(link_flags)
+       PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.ibex.Main -o $@ -Lupstream/install/$(target)/lib -Lupstream/install/lib $^ $(link_flags)
 
 
 ### Builtin Resources ##############################################################################
@@ -193,9 +206,9 @@ build/$(platform)/$(target_bin): build/$(platform)/org/ibex/plat/$(platform).cc.
 builtin_src := $(shell find src/org/ibex/builtin -name '*.*' \! -name '*.xcf')
 build/res/fonts/vera: .download_vera-1.10
        mkdir -p build/res/fonts/vera
-       cd build/res/fonts/vera; ln -s ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/Vera.ttf
-       cd build/res/fonts/vera; ln -s ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/VeraMono.ttf
-       cd build/res/fonts/vera; ln -s ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/VeraSe.ttf
+       cd build/res/fonts/vera; ln -fs ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/Vera.ttf
+       cd build/res/fonts/vera; ln -fs ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/VeraMono.ttf
+       cd build/res/fonts/vera; ln -fs ../../../../upstream/vera-1.10/ttf-bitstream-vera-1.10/VeraSe.ttf
 build/res/builtin.jar: $(builtin_src:src/%=build/res/%) build/res/fonts/vera
        @echo -e "\n\033[1mzipping            res/* -> .jar: builtin.jar\033[0m"
        cd build/res; $(jar) cf builtin.jar $(^:build/res/%=%)
@@ -244,7 +257,7 @@ build/mips/mipsapps.mips: build/mips/org/ibex/translators/Freetype.c.o build/mip
 current_build         := $(shell cat next.build)
 strip_$(platform) := upstream/install/$(target)/bin/strip build/$(platform)/$(target_bin) -o 
 strip_JVM       := cp build/$(platform)/$(target_bin)
-install-dist:;     $(strip_$(platform)) /var/www/master.dist.ibex.org/ibex-$(current_build).$(target_bin_extension).unsigned
+install-dist:;     $(strip_$(platform)) /var/www/org/xwt/dist/master/ibex-$(current_build).$(target_bin_extension).unsigned
 dist: compile
        (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