[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32824] trunk/blender: Add PREFIX support to makefiles.

gsr b3d gsr.b3d at infernal-iceberg.com
Tue Nov 2 00:17:58 CET 2010


Revision: 32824
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32824
Author:   gsrb3d
Date:     2010-11-02 00:17:58 +0100 (Tue, 02 Nov 2010)

Log Message:
-----------
Add PREFIX support to makefiles.

Modified Paths:
--------------
    trunk/blender/build_files/make/nan_definitions.mk
    trunk/blender/intern/ghost/intern/Makefile

Modified: trunk/blender/build_files/make/nan_definitions.mk
===================================================================
--- trunk/blender/build_files/make/nan_definitions.mk	2010-11-01 23:13:49 UTC (rev 32823)
+++ trunk/blender/build_files/make/nan_definitions.mk	2010-11-01 23:17:58 UTC (rev 32824)
@@ -296,6 +296,7 @@
     export HOST = $(shell hostname -s)
     export FREEDESKTOP ?= true
 
+    export BF_PREFIX ?= /usr/local
     export NAN_PYTHON ?= /usr/local
     export NAN_PYTHON_VERSION ?= 3.1
     export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION)
@@ -334,6 +335,8 @@
     export HOST = $(shell /usr/bsd/hostname -s)
     #export NAN_NO_KETSJI=true
     export NAN_JUST_BLENDERDYNAMIC=true
+
+    export BF_PREFIX ?= /usr/local
     export NAN_PYTHON_VERSION ?= 3.1
     ifeq ($(IRIX_USE_GCC), true)
         export NAN_PYTHON ?= $(LCGDIR)/python_gcc
@@ -392,6 +395,7 @@
     export HOST = $(shell hostname -s)
     export FREEDESKTOP ?= true
 
+    export BF_PREFIX ?= /usr/local
     export NAN_PYTHON ?= /usr
     export NAN_PYTHON_VERSION ?= 3.1
     export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION)
@@ -458,6 +462,7 @@
     export HOST = $(shell hostname -s)
     export FREEDESKTOP ?= true
 
+    export BF_PREFIX ?= /usr/local
     export NAN_PYTHON ?= $(LCGDIR)/python
     export NAN_PYTHON_VERSION ?= 3.1
     export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION)
@@ -494,6 +499,8 @@
 
     export ID = $(shell /usr/ucb/whoami)
     export HOST = $(shell hostname)
+
+    export BF_PREFIX ?= /usr/local
     export NAN_PYTHON ?= $(LCGDIR)/python
     export NAN_PYTHON_VERSION ?= 3.1
     export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION)

Modified: trunk/blender/intern/ghost/intern/Makefile
===================================================================
--- trunk/blender/intern/ghost/intern/Makefile	2010-11-01 23:13:49 UTC (rev 32823)
+++ trunk/blender/intern/ghost/intern/Makefile	2010-11-01 23:17:58 UTC (rev 32824)
@@ -71,4 +71,4 @@
 CPPFLAGS += -I$(OPENGL_HEADERS)
 CPPFLAGS += -I../../../source/blender/imbuf
 CPPFLAGS += -I../../../source/blender/makesdna
-
+CPPFLAGS += -DPREFIX=\"$(BF_PREFIX)\"





More information about the Bf-blender-cvs mailing list