X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=9be998c0d11cb6c91a232767ace8ee2ae7147d96;hb=0f364856b7ab3ffbc3f3d36a5fcd0288109ecb35;hp=2c2e266e274caaf0d99d3f41c69037027b333097;hpb=73e6a2f860cae4f61f0856a32c0cc062217befcb;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index 2c2e266..9be998c 100644
--- a/Makefile
+++ b/Makefile
@@ -31,6 +31,9 @@ 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
 
+# stupid broke-ass darwin linker...
+darwin_linker_flags += build/Darwin/org/xwt/plat/OpenGL.java.o build/Darwin/org/xwt/plat/POSIX.java.o
+
 target_bin_extension_$(platform) := $(shell echo $(platform) | tr A-Z a-z)
 target_bin_extension_Win32       := exe
 target_bin_extension_JVM         := jar
@@ -168,7 +171,7 @@ upstream/jpeg-6b/build-$(target)/libjpeg.a: .install_jpeg-6b_$(target)
 build/$(platform)/$(target_bin): build/$(platform)/org/xwt/plat/$(platform).cc.o upstream/jpeg-6b/build-$(target)/libjpeg.a build/$(platform)/builtin.o build/$(platform)/$(platform).ar build/$(platform)/org/xwt/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.xwt.plat.$(platform) -o $@ -Lupstream/install/$(target)/lib $^ $(link_flags)
+	PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.xwt.Main -o $@ -Lupstream/install/$(target)/lib $^ $(link_flags)
 
 
 ### Builtin Resources ##############################################################################