From f56eb94babba711036d3c2710ae2cacc09fddc70 Mon Sep 17 00:00:00 2001 From: Wouter van Heyst Date: Thu, 1 Jan 2004 23:19:08 +0000 Subject: Work done to build blender on Linux [sparc64]. extern/ode/dist/ode/test/test_ode.cpp: - Don't include on sparc linux, it doesn't exist. extern/ode/Makefile: - While hacking on ode, get rid of that annoying infinite rebuild source/Makefile: - Define a default BINTARGETS (just blenderdynamic) for linux, individual archs can override/add to that if they so please source/nan_link.nmk: - Add a sparc64 arch target to the linux section of nan_link.mk, using the same options as powerpc After the first ode problem, the build completed all but the linking of a blender binary, because there wasn't any target defined! On the rebuilding: The usersettings would have a newer date than targets depending on it, so it would rebuild entirely. I haven't really fixed this, but isolated it to the platforms where usersettings need to be moved around (darwin and windows). FBSD patches the usersettings, so it might still happen there. I didn't bother with a proper fix, as it looks like we're moving to scons soon. I'm amazed no one got annoyed enough before to take care of this. --- extern/ode/Makefile | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'extern') diff --git a/extern/ode/Makefile b/extern/ode/Makefile index 3495d59231e..f1d2c98fe23 100644 --- a/extern/ode/Makefile +++ b/extern/ode/Makefile @@ -39,8 +39,10 @@ TEMPSETTINGS = ./user-settings all: [ -d $(DISTDIR)/lib ] || mkdir $(DISTDIR)/lib # prepare settings for patching, clean in case of interruption + ifeq ($(OS),$(findstring $(OS), "darwin windows")) [ ! -f $(TEMPSETTINGS) ] || mv $(TEMPSETTINGS) $(USERSETTINGS) cp $(USERSETTINGS) $(TEMPSETTINGS) + endif ifeq ($(OS),freebsd) (grep FreeBSD $(DISTDIR)/Makefile >/dev/null ; \ [ $$? -eq 0 ] || patch < patchfile.FreeBSD ) @@ -57,7 +59,9 @@ all: $(MAKE) -C $(DISTDIR) endif # restore settings + ifeq ($(OS),$(findstring $(OS), "darwin windows")) mv $(TEMPSETTINGS) $(USERSETTINGS) + endif # fake debug target debug: -- cgit v1.2.3