Update make system for darwin;

- using python framework (default on, set it off with define in
  definitions.mk)
- not installing .bfont.tff

4 files changed, 26 insertions, 13 deletions

diff --git a/source/Makefile b/source/Makefile
index 9e344f38ad6..3158498ba8f 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -88,10 +88,10 @@ PYPLAYERLIB ?= $(PYLIB)
     GRPLIB += $(OCGDIR)/blender/render/$(DEBUG_DIR)librender.a
     GRPLIB += $(OCGDIR)/blender/radiosity/$(DEBUG_DIR)libradiosity.a
     GRPLIB += $(NAN_OPENNL)/lib/$(DEBUG_DIR)libopennl.a
-    GRPLIB += $(NAN_SUPERLU)/lib/$(DEBUG_DIR)libsuperlu.a
-
+    GRPLIB += $(NAN_SUPERLU)/lib/$(DEBUG_DIR)libsuperlu.a	
     GRPLIB += $(OCGDIR)/blender/python/$(DEBUG_DIR)libpython.a
 
+
 # nlin: the reason that some libraries appear more than once below is
 # to handle circular dependencies in linking among libraries... some
 # linkers (e.g. under Linux) need libs to be specified multiple times
@@ -282,10 +282,12 @@ endif
 ifeq ($(OS),darwin)
     BINTARGETS = blenderdynamic.app
     BINTARGETS += blenderplayer.app
-    PYLIB = $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a
-    # Next line would enable MxTextTools (for VRML2 import) 
-    # but results in a link error
-    # PYLIB += $(NAN_MXTEXTTOOLS) 
+
+    ifdef PY_FRAMEWORK
+        PYLIB = -framework Python
+    else 
+        PYLIB = $(NAN_PYTHON)/lib/python$(NAN_PYTHON_VERSION)/config/libpython$(NAN_PYTHON_VERSION).a
+    endif
 endif
 
 ifeq ($(OS),freebsd)
diff --git a/source/darwin/Makefile b/source/darwin/Makefile
index c4006d1ae80..b87e290011f 100644
--- a/source/darwin/Makefile
+++ b/source/darwin/Makefile
@@ -47,9 +47,10 @@ all::
 ifeq ($(APPLICATION), blender)
 	@echo "---> copying message files"
 	@cp -R $(NANBLENDERHOME)/bin/.blender/locale $(DIR)/bin/$(APPLICATION).app/Contents/Resources
-	@echo "---> copying .Blanguages and .bfont.ttf"
+	@echo "---> copying .Blanguages"
 	@cp $(NANBLENDERHOME)/bin/.blender/.Blanguages $(DIR)/bin/$(APPLICATION).app/Contents/Resources
-	@cp $(NANBLENDERHOME)/bin/.blender/.bfont.ttf $(DIR)/bin/$(APPLICATION).app/Contents/Resources
+	@echo "---> copying .blender/ scripts"
+	@cp -R $(NANBLENDERHOME)/bin/.blender $(DIR)/bin/$(APPLICATION).app/Contents/MacOS
 endif
 	@echo "---> removing CVS directories and Mac hidden files from distribution"
 	@find $(DIR)/bin/$(APPLICATION).app -name CVS -prune -exec rm -rf {} \;
diff --git a/source/nan_compile.mk b/source/nan_compile.mk
index 3b8a095cdef..17f05e46e2a 100644
--- a/source/nan_compile.mk
+++ b/source/nan_compile.mk
@@ -37,7 +37,7 @@ CPPFLAGS ?= $(NAN_CPPFLAGS)
 
 # common parts ---------------------------------------------------
 
-# Uncomment next line to enable integrated game engine
+# Uncomment next lines to enable integrated game engine
 CFLAGS  += -DGAMEBLENDER=1
 CFLAGS  += -DUSE_SUMO_SOLID
 CCFLAGS += -DUSE_SUMO_SOLID
@@ -78,7 +78,7 @@ endif
 ifeq ($(OS),darwin)
     CC	= gcc
     CCC	= g++
-    CFLAGS	+= -pipe -fPIC -ffast-math -mcpu=7450 -mtune=7450
+    CFLAGS	+= -pipe -fPIC -ffast-math
     CCFLAGS	+= -pipe -fPIC
     REL_CFLAGS	+= -O2
     REL_CCFLAGS	+= -O2
diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk
index 697c9093d58..721bb694b59 100644
--- a/source/nan_definitions.mk
+++ b/source/nan_definitions.mk
@@ -136,9 +136,19 @@ endif
 
     export ID = $(shell whoami)
     export HOST = $(shell hostname -s)
-    export NAN_PYTHON ?= /sw
-    export NAN_PYTHON_VERSION ?= 2.3
-    export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION)
+
+    export PY_FRAMEWORK	= 1    
+
+    ifdef PY_FRAMEWORK
+       export NAN_PYTHON ?= /System/Library/Frameworks/Python.framework/Versions/2.3
+       export NAN_PYTHON_VERSION ?= 2.3
+       export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION)
+    else 
+       export NAN_PYTHON ?= /sw
+       export NAN_PYTHON_VERSION ?= 2.3
+       export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION)
+    endif
+
     export NAN_OPENAL ?= $(LCGDIR)/openal
     export NAN_FMOD ?= $(LCGDIR)/fmod
     export NAN_JPEG ?= /sw