diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-11-13 00:16:53 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-11-13 00:16:53 +0300 |
commit | bdfe7d89e2f1292644577972c716931b4ce3c6c3 (patch) | |
tree | d00eb50b749cb001e2b08272c91791e66740b05d /source/nan_compile.mk | |
parent | 78a1c27c4a6abe0ed31ca93ad21910f3df04da56 (diff) | |
parent | 7e4db234cee71ead34ee81a12e27da4bd548eb4b (diff) |
Merge of trunk into blender 2.5:
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r12987:17416
Issues:
* GHOST/X11 had conflicting changes. Some code was added in 2.5, which was
later added in trunk also, but reverted partially, specifically revision
16683. I have left out this reversion in the 2.5 branch since I think it is
needed there.
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16683
* Scons had various conflicting changes, I decided to go with trunk version
for everything except priorities and some library renaming.
* In creator.c, there were various fixes and fixes for fixes related to the -w
-W and -p options. In 2.5 -w and -W is not coded yet, and -p is done
differently. Since this is changed so much, and I don't think those fixes
would be needed in 2.5, I've left them out.
* Also in creator.c: there was code for a python bugfix where the screen was not
initialized when running with -P. The code that initializes the screen there
I had to disable, that can't work in 2.5 anymore but left it commented as a
reminder.
Further I had to disable some new function calls. using src/ and python/, as
was done already in this branch, disabled function calls:
* bpath.c: error reporting
* BME_conversions.c: editmesh conversion functions.
* SHD_dynamic: disabled almost completely, there is no python/.
* KX_PythonInit.cpp and Ketsji/ build files: Mathutils is not there, disabled.
* text.c: clipboard copy call.
* object.c: OB_SUPPORT_MATERIAL.
* DerivedMesh.c and subsurf_ccg, stipple_quarttone.
Still to be done:
* Go over files and functions that were moved to a different location but could
still use changes that were done in trunk.
Diffstat (limited to 'source/nan_compile.mk')
-rw-r--r-- | source/nan_compile.mk | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/source/nan_compile.mk b/source/nan_compile.mk index fd7960dff24..4b13ef8f678 100644 --- a/source/nan_compile.mk +++ b/source/nan_compile.mk @@ -40,13 +40,18 @@ ifneq ($(NAN_NO_KETSJI), true) CFLAGS += -DUSE_SUMO_SOLID CCFLAGS += -DUSE_SUMO_SOLID ifeq ($(NAN_USE_BULLET), true) - CFLAGS += -DUSE_BULLET - CCFLAGS += -DUSE_BULLET + CFLAGS += -DUSE_BULLET -DWITH_BULLET + CCFLAGS += -DUSE_BULLET -DWITH_BULLET endif else CPPFLAGS += -DNO_KETSJI endif +ifeq ($(WITH_BF_OPENMP), true) + CFLAGS += -fopenmp + CCFLAGS += -fopenmp +endif + ifdef NAN_DEBUG CFLAGS += $(NAN_DEBUG) CCFLAGS += $(NAN_DEBUG) @@ -168,10 +173,17 @@ ifeq ($(OS),openbsd) endif ifeq ($(OS),solaris) - CC = gcc - CCC = g++ -# CC = cc -# CCC = CC + # Adding gcc flag to $CC is not good, however if its not there makesdna wont build - Campbell + ifeq (x86_64, $(findstring x86_64, $(CPU))) + CC = gcc -m64 + CCC = g++ -m64 + else + CC = gcc + CCC = g++ + #CC = cc + #CCC = CC + endif + JAVAC = javac JAVAH = javah CFLAGS += -pipe -fPIC -funsigned-char -fno-strict-aliasing @@ -179,6 +191,7 @@ ifeq ($(OS),solaris) # CFLAGS += "-fast -xdepend -xarch=v8plus -xO3 -xlibmil -KPIC -DPIC -xchar=unsigned" # CCFLAGS += "-fast -xdepend -xarch=v8plus -xO3 -xlibmil -xlibmopt -features=tmplife -norunpath -KPIC -DPIC -xchar=unsigned" + # Note, you might still want to compile a 32 bit binary if you have a 64bit system. if so remove the following lines # ifeq ($(findstring 64,$(CPU)), 64) # CFLAGS += -m64 # CCFLAGS += -m64 @@ -195,7 +208,8 @@ ifeq ($(OS),solaris) JAVA_HEADERS = /usr/java/include JAVA_SYSTEM_HEADERS = /usr/java/include/solaris else - OPENGL_HEADERS = $(LCGDIR)/mesa/include + # OPENGL_HEADERS = /usr/X11/include/mesa + OPENGL_HEADERS = /usr/X11/include/ endif AR = ar ARFLAGS = ruv |