diff options
| author | Ton Roosendaal <ton@blender.org> | 2004-05-01 20:52:29 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2004-05-01 20:52:29 +0400 |
| commit | e7df984c16997d6ce60724665211cfaab1050793 (patch) | |
| tree | 2ea35465c5b66db96293bae0cdd1bde235523f06 | |
| parent | dcb83e27a2439a44ab382313f5af255de91aa4f2 (diff) | |
Changes for OSX compiling with Makefiles;v2.33
- support 2.3 python
- use -O2 for all
- fixed reference to SOLID.h
| -rw-r--r-- | source/gameengine/BlenderRoutines/Makefile | 1 | ||||
| -rw-r--r-- | source/nan_compile.mk | 6 | ||||
| -rw-r--r-- | source/nan_definitions.mk | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/source/gameengine/BlenderRoutines/Makefile b/source/gameengine/BlenderRoutines/Makefile index 7f8cc9d152d..f0097e40807 100644 --- a/source/gameengine/BlenderRoutines/Makefile +++ b/source/gameengine/BlenderRoutines/Makefile @@ -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 diff --git a/source/nan_compile.mk b/source/nan_compile.mk index be73368bfc1..3b8a095cdef 100644 --- a/source/nan_compile.mk +++ b/source/nan_compile.mk @@ -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 diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk index 145d9ffbce3..8ead186f137 100644 --- a/source/nan_definitions.mk +++ b/source/nan_definitions.mk @@ -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 |