[Bf-blender-cvs] [9c0e43e] cycles-ptex-24: Scons
Nicholas Bishop
noreply at git.blender.org
Fri Jan 30 18:00:57 CET 2015
Commit: 9c0e43ec4bf245e1f1f75eacf0ae01d260a5ed55
Author: Nicholas Bishop
Date: Fri Jan 30 11:14:00 2015 +0100
Branches: cycles-ptex-24
https://developer.blender.org/rB9c0e43ec4bf245e1f1f75eacf0ae01d260a5ed55
Scons
===================================================================
M extern/SConscript
M intern/cycles/SConscript
M source/blender/blenkernel/SConscript
M source/blender/imbuf/SConscript
===================================================================
diff --git a/extern/SConscript b/extern/SConscript
index 1f94f50..7796732 100644
--- a/extern/SConscript
+++ b/extern/SConscript
@@ -12,6 +12,8 @@ SConscript(['rangetree/SConscript'])
SConscript(['wcwidth/SConscript'])
SConscript(['libmv/SConscript'])
+SConscript(['ptex/SConscript'])
+
if env['WITH_BF_GAMEENGINE']:
SConscript(['recastnavigation/SConscript'])
diff --git a/intern/cycles/SConscript b/intern/cycles/SConscript
index 9cbdb93..f3a6a72 100644
--- a/intern/cycles/SConscript
+++ b/intern/cycles/SConscript
@@ -81,7 +81,9 @@ incs.append(env['BF_GLEW_INC'])
incs.append('#/intern/glew-mx')
incs.append('#/intern/atomic')
incs.append('#intern/mikktspace')
-incs.extend('#extern/glew/include #extern/clew/include #extern/cuew/include #intern/mikktspace'.split())
+incs.extend('#extern/glew/include #extern/clew/include #extern/cuew/include #intern/mikktspace #extern/ptex'.split())
+
+defs.append('WITH_PTEX')
incs.append(cycles['BF_OIIO_INC'])
incs.append(cycles['BF_BOOST_INC'])
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript
index 47bba5f..bc75d56 100644
--- a/source/blender/blenkernel/SConscript
+++ b/source/blender/blenkernel/SConscript
@@ -45,6 +45,7 @@ incs = [
'#/intern/raskter',
'#/intern/rigidbody',
'#/extern/bullet2/src',
+ '#/extern/ptex',
env['BF_GLEW_INC'],
'#/intern/ghost',
'#/intern/glew-mx',
diff --git a/source/blender/imbuf/SConscript b/source/blender/imbuf/SConscript
index ccee3eb..1fb22c4 100644
--- a/source/blender/imbuf/SConscript
+++ b/source/blender/imbuf/SConscript
@@ -36,6 +36,7 @@ incs = [
'#/intern/ffmpeg',
'#/intern/guardedalloc',
'#/intern/memutil',
+ '#/extern/ptex',
'../avi',
'../blenkernel',
'../blenlib',
More information about the Bf-blender-cvs
mailing list