diff options
| -rw-r--r-- | extern/ode/Makefile | 4 | ||||
| -rw-r--r-- | source/Makefile | 1 | ||||
| -rw-r--r-- | source/nan_link.mk | 4 |
3 files changed, 7 insertions, 2 deletions
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: diff --git a/source/Makefile b/source/Makefile index 6088db76bf7..4267f780fb1 100644 --- a/source/Makefile +++ b/source/Makefile @@ -303,6 +303,7 @@ ifeq ($(OS),irix) endif ifeq ($(OS),linux) + BINTARGETS = blenderdynamic ifeq ($(CPU),alpha) BINTARGETS = blenderdynamic BINTARGETS += blenderplayer diff --git a/source/nan_link.mk b/source/nan_link.mk index 326765eb027..fd117f6e4f7 100644 --- a/source/nan_link.mk +++ b/source/nan_link.mk @@ -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 |