Work done to build blender on Linux [sparc64].

extern/ode/dist/ode/test/test_ode.cpp:
- Don't include <ieeefp.h> 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.
This commit is contained in:
Wouter van Heyst 2004-01-01 23:19:08 +00:00
parent 7f90973344
commit f56eb94bab
3 changed files with 7 additions and 2 deletions

4
extern/ode/Makefile vendored

@ -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:

@ -303,6 +303,7 @@ ifeq ($(OS),irix)
endif
ifeq ($(OS),linux)
BINTARGETS = blenderdynamic
ifeq ($(CPU),alpha)
BINTARGETS = blenderdynamic
BINTARGETS += blenderplayer

@ -102,12 +102,12 @@ ifeq ($(OS),linux)
SADD = $(NAN_MESA)/lib/libGL.a $(NAN_MESA)/lib/libGLU.a
DYNLDFLAGS = -shared $(LDFLAGS)
endif
ifeq ($(CPU),powerpc)
COMMENT = "MESA 3.1"
ifeq ($(CPU),$(findstring $(CPU), "powerpc sparc64"))
LLIBS = -L/usr/X11R6/lib/ -lXmu -lXext -lX11 -lc -ldl -lm -lutil
DADD = -lGL -lGLU
SADD = /usr/lib/libGL.a /usr/lib/libGLU.a
LOPTS = -export-dynamic
DYNLDFLAGS = -shared $(LDFLAGS)
endif
LLIBS += -lz
endif