X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=92d7a4effd019018eeeef9166238693fb5857dbe;hb=27c78c6a15146e532ec1c34019943fbf10d95d4e;hp=21fafd2ba75e7f21c13a384ea29b39aa4b652e3c;hpb=4ba6b1dd489dd908640f290bbe4bf44bd2cf4007;p=org.ibex.core.git

diff --git a/Makefile b/Makefile
index 21fafd2..92d7a4e 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.Main -o $@ -Lupstream/install/$(target)/lib build/$(platform)/org/xwt/plat/$(platform).java.o $^ $(link_flags)
+	PATH=upstream/install/bin:$$PATH $(gcj) -v --main=org.xwt.Main -o $@ -Lupstream/install/$(target)/lib $^ $(link_flags)
 
 
 ### Builtin Resources ##############################################################################
@@ -251,9 +254,9 @@ current_build         := $(shell cat next.build)
 this_branch           := $(shell tail -c +2 CVS/Tag 2>/dev/null || echo HEAD)
 this_branch_flag      := $(shell test $(this_branch) = HEAD && echo || echo -r $(this_branch))
 
-strip_$(target) := upstream/install/$(target)/bin/strip build/$(platform)/$(target_bin) -o 
+strip_$(platform) := upstream/install/$(target)/bin/strip build/$(platform)/$(target_bin) -o 
 strip_JVM       := cp build/$(platform)/$(target_bin)
-install-dist:;     $(strip_$(target)) /var/www/master.dist.xwt.org/xwt-$(current_build).$(target_bin_extension).unsigned
+install-dist:;     $(strip_$(platform)) /var/www/master.dist.xwt.org/xwt-$(current_build).$(target_bin_extension).unsigned
 dist: compile
 ifneq ($(shell uname -n),megacz.com)
 	echo "***********************************************************"