Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/extern
diff options
context:
space:
mode:
authorJean-Luc Peurière <jlp@nerim.net>2004-05-08 05:34:39 +0400
committerJean-Luc Peurière <jlp@nerim.net>2004-05-08 05:34:39 +0400
commitac47d081c4025d20074f5afadb5121135e8c055a (patch)
treec6258aa2f64dd915e37fe5e59631ce8b8b63bda0 /extern
parentbd50d2f9cdaa5f84434cc3c5ba58fec94b84fdab (diff)
post 2.33 release commit of the modified SCons files for Os X.
Sconstruct modified so that Blender build on 10.3 without any additionnal download than source + darwin libs. defaults settings correct for 10.3. fixed bug # 1260 : added MT_NDEBUG flag at top-level.
Diffstat (limited to 'extern')
-rw-r--r--extern/qhull/SConscript2
-rw-r--r--extern/solid/SConscript8
2 files changed, 8 insertions, 2 deletions
diff --git a/extern/qhull/SConscript b/extern/qhull/SConscript
index 1be051c4623..d1bd0699e2b 100644
--- a/extern/qhull/SConscript
+++ b/extern/qhull/SConscript
@@ -12,6 +12,8 @@ elif sys.platform=='win32':
qhull_env.Append (CCFLAGS = ['/O2'])
elif sys.platform=='sunos':
qhull_env.Append (CCFLAGS = ['Xc', '-v', '-fast'])
+elif sys.platform=='darwin':
+ qhull_env.Append (CCFLAGS = ['-O2', '-pipe', '-fPIC', '-funsigned-char', '-ffast-math'])
else:
qhull_env.Append (CCFLAGS = cflags)
qhull_env.Append (CPPDEFINES = defines)
diff --git a/extern/solid/SConscript b/extern/solid/SConscript
index 0ea99337c05..e0397f67dc7 100644
--- a/extern/solid/SConscript
+++ b/extern/solid/SConscript
@@ -15,8 +15,12 @@ if sys.platform=='win32':
#cflags += ['/MT', '/W3', '/GX', '/O2', '/Op']
cflags += ['/MT', '/W3', '/GX', '/Og', '/Ot', '/Ob1', '/Op', '/G6']
elif sys.platform=='linux2' or sys.platform=='linux-i386':
- defines += ['NDEBUG']
- cflags += ['-O2']
+ defines += ['NDEBUG']
+ cflags += ['-O2']
+elif sys.platform=='darwin' :
+ defines += ['NDEBUG']
+ cflags += ['-O2', '-pipe', '-fPIC', '-funsigned-char', '-ffast-math']
+
else:
print "################################################"
print