forked from bartvdbraak/blender
Changes for OSX compiling with Makefiles;
- support 2.3 python - use -O2 for all - fixed reference to SOLID.h
This commit is contained in:
parent
dcb83e27a2
commit
e7df984c16
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user