X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=92d7a4effd019018eeeef9166238693fb5857dbe;hb=27c78c6a15146e532ec1c34019943fbf10d95d4e;hp=9c68fe330fa52b394a690b7f5cba000e263b615d;hpb=259bc29e846fc13082bd434862a73cf0644c25f2;p=org.ibex.core.git diff --git a/Makefile b/Makefile index 9c68fe3..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 @@ -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 "***********************************************************"