X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=6c2e7c2226dc27de018b6a8e670c5552824897c7;hb=6859d0f695ae73ec428ded18a1a85ab7d264c470;hp=77ff333717d20efb5469bfa977cfb361c5f083dc;hpb=e2dab289d7adfebb01adf5ce782e7fa1b122cded;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index 77ff333..6c2e7c2 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ dist-clean:
 
 JVM:        build/JVM/ibex.jar
 Linux:    ; make gcj platform=Linux   link_flags="upstream/install/lib/libExtraWINGs.a upstream/install/lib/libWINGs.a upstream/install/lib/libwraster.a -L/usr/X11R6/lib -lXpm -lX11 -lXext"
-Solaris:  ; make gcj platform=Solaris link_flags="-lX11 -lXext -lpthread"
+Solaris:  ; make gcj platform=Solaris link_flags="-Lupstream/install/sparc-sun-solaris2.7/lib/ upstream/install/sparc-sun-solaris2.7/lib/libExtraWINGs.a upstream/install/sparc-sun-solaris2.7/lib/libWINGs.a upstream/install/sparc-sun-solaris2.7/lib/libwraster.a -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,7 +167,10 @@ build/$(platform)/%.java.o: build/java/%.java
 	mkdir -p `dirname $@`
 	$(gcj) -c $< -o $@
 
-build/$(platform)/org/ibex/plat/X11.cc.o: .install_WindowMaker-0.80.2_$(target) 
+# 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"
@@ -245,7 +248,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