diff options
-rw-r--r-- | SConstruct | 1 | ||||
-rw-r--r-- | source/blender/SConscript | 3 | ||||
-rw-r--r-- | source/blender/render/SConscript | 3 | ||||
-rw-r--r-- | source/blender/src/SConscript | 3 | ||||
-rw-r--r-- | source/blender/yafray/SConscript | 20 |
5 files changed, 26 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct index 000c4070e98..3b8527f7c77 100644 --- a/SConstruct +++ b/SConstruct @@ -247,6 +247,7 @@ SConscript(['intern/SConscript', libpath = (['lib']) libraries = (['blender_render', + 'blender_yafray', 'blender_blendersrc', 'blender_renderconverter', 'blender_blenloader', diff --git a/source/blender/SConscript b/source/blender/SConscript index 02e39aacb97..3b01792081d 100644 --- a/source/blender/SConscript +++ b/source/blender/SConscript @@ -19,7 +19,8 @@ SConscript(['blenloader/SConscript', 'python/SConscript', 'makesdna/SConscript', 'src/SConscript', - 'renderconverter/SConscript']) + 'renderconverter/SConscript', + 'yafray/SConscript']) if use_international == 'true': SConscript (['ftfont/SConscript']) diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript index 2307ba033ad..311f90d27d6 100644 --- a/source/blender/render/SConscript +++ b/source/blender/render/SConscript @@ -40,6 +40,7 @@ render_env.Append (CPPPATH = ['intern/include', '../imbuf', '../quicktime', '../include', - '../../kernel/gen_messaging']) + '../../kernel/gen_messaging', + '../yafray']) render_env.Library (target='#/lib/blender_render', source=source_files) diff --git a/source/blender/src/SConscript b/source/blender/src/SConscript index 3d79f01f329..8b84934271f 100644 --- a/source/blender/src/SConscript +++ b/source/blender/src/SConscript @@ -115,8 +115,7 @@ source_files = ['B.blend.c', 'writeavicodec.c', 'writeimage.c', 'writemovie.c', - 'language.c', - 'yafray_Render.cpp'] + 'language.c'] src_env.Append (CPPPATH = ['#/intern/guardedalloc', '../blenlib', diff --git a/source/blender/yafray/SConscript b/source/blender/yafray/SConscript new file mode 100644 index 00000000000..49f0a0c6678 --- /dev/null +++ b/source/blender/yafray/SConscript @@ -0,0 +1,20 @@ +yafray_env = Environment() + +# Import the C flags set in the SConstruct file +Import ('cflags') +Import ('cxxflags') +Import ('defines') +yafray_env.Append (CCFLAGS = cflags) +yafray_env.Append (CXXFLAGS = cxxflags) +yafray_env.Append (CPPDEFINES = defines) + +source_files = ['intern/yafray_Render.cpp'] + +yafray_env.Append (CPPPATH = ['#/intern/guardedalloc', + '../blenlib', + '../makesdna', + '../blenkernel', + '../imbuf', + '../render/extern/include']) + +yafray_env.Library (target='#/lib/blender_yafray', source=source_files) |