Changes for OSX compiling with Makefiles; v2.33
authorTon Roosendaal <ton@blender.org>
Sat, 1 May 2004 16:52:29 +0000 (16:52 +0000)
committerTon Roosendaal <ton@blender.org>
Sat, 1 May 2004 16:52:29 +0000 (16:52 +0000)
- support 2.3 python
- use -O2 for all
- fixed reference to SOLID.h

source/gameengine/BlenderRoutines/Makefile
source/nan_compile.mk
source/nan_definitions.mk

index 7f8cc9d152d024f5b5837bbae4a90d0a77a7cd3d..f0097e40807e103c403eea8cd8fccce25b34df34 100644 (file)
@@ -40,6 +40,7 @@ CCFLAGS += $(LEVEL_1_CPP_WARNINGS)
 
 CPPFLAGS += -I$(OPENGL_HEADERS)
 CPPFLAGS += -I$(NAN_SUMO)/include -I$(NAN_SOLID)/include
+CPPFLAGS += -I$(NAN_SOLID)
 CPPFLAGS += -I$(NAN_STRING)/include    
 CPPFLAGS += -I$(NAN_MOTO)/include
 CPPFLAGS += -I$(NAN_BMFONT)/include
index be73368bfc104429be1f01eba54d1c52779f2844..3b8a095cdef26b978221fb4f2148b24766dc9c47 100644 (file)
@@ -78,10 +78,10 @@ endif
 ifeq ($(OS),darwin)
     CC = gcc
     CCC        = g++
-    CFLAGS     += -pipe -fPIC
+    CFLAGS     += -pipe -fPIC -ffast-math -mcpu=7450 -mtune=7450
     CCFLAGS    += -pipe -fPIC
-    REL_CFLAGS += -O
-    REL_CCFLAGS        += -O
+    REL_CFLAGS += -O2
+    REL_CCFLAGS        += -O2
     CPPFLAGS   += -D_THREAD_SAFE
     NAN_DEPEND = true
     OPENGL_HEADERS = /System/Library/Frameworks/OpenGL.framework
index 145d9ffbce3bddb485ef691a0be0412c303ded95..8ead186f137990198c24d6a203ed718c4912e586 100644 (file)
@@ -135,7 +135,7 @@ endif
     export ID = $(shell whoami)
     export HOST = $(shell hostname -s)
     export NAN_PYTHON ?= /sw
-    export NAN_PYTHON_VERSION ?= 2.2
+    export NAN_PYTHON_VERSION ?= 2.3
     export NAN_PYTHON_BINARY ?= $(NAN_PYTHON)/bin/python$(NAN_PYTHON_VERSION)
     export NAN_OPENAL ?= $(LCGDIR)/openal
     export NAN_FMOD ?= $(LCGDIR)/fmod