[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60378] branches/soc-2013-vse: Adding SCons support
Alexander Kuznetsov
kuzsasha at gmail.com
Thu Sep 26 06:32:56 CEST 2013
Revision: 60378
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60378
Author: alexk
Date: 2013-09-26 04:32:56 +0000 (Thu, 26 Sep 2013)
Log Message:
-----------
Adding SCons support
Modified Paths:
--------------
branches/soc-2013-vse/SConstruct
branches/soc-2013-vse/source/blender/SConscript
branches/soc-2013-vse/source/blender/blenkernel/SConscript
branches/soc-2013-vse/source/blender/editors/space_sequencer/SConscript
branches/soc-2013-vse/source/blender/windowmanager/SConscript
Added Paths:
-----------
branches/soc-2013-vse/source/blender/cldm/SConscript
branches/soc-2013-vse/source/blender/sequencer/SConscript
Removed Paths:
-------------
branches/soc-2013-vse/source/blender/sequencer/sequencer_seqCache.cpp
Modified: branches/soc-2013-vse/SConstruct
===================================================================
--- branches/soc-2013-vse/SConstruct 2013-09-26 04:26:12 UTC (rev 60377)
+++ branches/soc-2013-vse/SConstruct 2013-09-26 04:32:56 UTC (rev 60378)
@@ -545,6 +545,11 @@
data_to_c_simple("source/blender/gpu/shaders/gpu_shader_vertex.glsl")
data_to_c_simple("source/blender/gpu/shaders/gpu_shader_vsm_store_frag.glsl")
data_to_c_simple("source/blender/gpu/shaders/gpu_shader_vsm_store_vert.glsl")
+
+ # --- sequencer opencl ---
+ data_to_c_simple("source/blender/sequencer/kernel/kernel_working.cl")
+ data_to_c_simple("source/blender/sequencer/kernel/include_type_float.cl")
+ data_to_c_simple("source/blender/sequencer/kernel/common_stuctures.cl")
# --- blender ---
data_to_c_simple("release/datafiles/bfont.pfb")
Modified: branches/soc-2013-vse/source/blender/SConscript
===================================================================
--- branches/soc-2013-vse/source/blender/SConscript 2013-09-26 04:26:12 UTC (rev 60377)
+++ branches/soc-2013-vse/source/blender/SConscript 2013-09-26 04:32:56 UTC (rev 60378)
@@ -42,7 +42,9 @@
'modifiers/SConscript',
'ikplugin/SConscript',
'windowmanager/SConscript',
- 'blenfont/SConscript'])
+ 'blenfont/SConscript',
+ 'cldm/SConscript',
+ 'sequencer/SConscript'])
makesrna = SConscript('makesrna/SConscript')
Modified: branches/soc-2013-vse/source/blender/blenkernel/SConscript
===================================================================
--- branches/soc-2013-vse/source/blender/blenkernel/SConscript 2013-09-26 04:26:12 UTC (rev 60377)
+++ branches/soc-2013-vse/source/blender/blenkernel/SConscript 2013-09-26 04:32:56 UTC (rev 60378)
@@ -63,6 +63,8 @@
'../makesdna',
'../makesrna',
'../modifiers',
+ '../sequencer',
+ '../cldm',
'../nodes',
'../render/extern/include',
'../windowmanager',
Added: branches/soc-2013-vse/source/blender/cldm/SConscript
===================================================================
--- branches/soc-2013-vse/source/blender/cldm/SConscript (rev 0)
+++ branches/soc-2013-vse/source/blender/cldm/SConscript 2013-09-26 04:32:56 UTC (rev 60378)
@@ -0,0 +1,17 @@
+import sys
+Import ('env')
+
+sources = env.Glob('*.c')
+
+incs = [
+ '.',
+ '#/intern/guardedalloc',
+ '#/intern/opencl'
+ ]
+
+
+defs = ['GLEW_STATIC']
+
+
+
+env.BlenderLib('bf_cldm', sources, incs, defines=defs, libtype=['core', 'player'], priority=[180, 180])
Modified: branches/soc-2013-vse/source/blender/editors/space_sequencer/SConscript
===================================================================
--- branches/soc-2013-vse/source/blender/editors/space_sequencer/SConscript 2013-09-26 04:26:12 UTC (rev 60377)
+++ branches/soc-2013-vse/source/blender/editors/space_sequencer/SConscript 2013-09-26 04:32:56 UTC (rev 60378)
@@ -33,13 +33,16 @@
'#/intern/guardedalloc',
'#/extern/glew/include',
'#/intern/audaspace/intern',
+ '#/intern/opencl',
'../include',
'../../blenfont',
'../../blenkernel',
'../../blenlib',
+ '../../cldm',
'../../imbuf',
'../../makesdna',
'../../makesrna',
+ '../../sequencer',
'../../windowmanager',
]
Added: branches/soc-2013-vse/source/blender/sequencer/SConscript
===================================================================
--- branches/soc-2013-vse/source/blender/sequencer/SConscript (rev 0)
+++ branches/soc-2013-vse/source/blender/sequencer/SConscript 2013-09-26 04:32:56 UTC (rev 60378)
@@ -0,0 +1,30 @@
+
+Import ('env')
+
+sources = env.Glob('*.cpp') + env.Glob('effects/*.cpp') +env.Glob('commands/*.cpp')
+
+incs = [
+ '.',
+ './kernel',
+ '#/intern/opencl',
+ '#/intern/guardedalloc',
+ '../makesdna',
+ '../blenlib',
+ '../blenkernel',
+ '../cldm',
+ '../imbuf',
+ '../editors/include'
+ ]
+
+defs = []
+
+
+import os
+sources.extend((
+ os.path.join(env['DATA_SOURCES'], "kernel_working.cl.c"),
+ os.path.join(env['DATA_SOURCES'], "include_type_float.cl.c"),
+ os.path.join(env['DATA_SOURCES'], "common_stuctures.cl.c")
+ ))
+
+
+env.BlenderLib('bf_sequencer', sources, incs, defines=defs, libtype=['core', 'player'], priority=[165, 155])
Deleted: branches/soc-2013-vse/source/blender/sequencer/sequencer_seqCache.cpp
===================================================================
--- branches/soc-2013-vse/source/blender/sequencer/sequencer_seqCache.cpp 2013-09-26 04:26:12 UTC (rev 60377)
+++ branches/soc-2013-vse/source/blender/sequencer/sequencer_seqCache.cpp 2013-09-26 04:32:56 UTC (rev 60378)
@@ -1,13 +0,0 @@
-#include "sequencer_seqCache.h"
-/*
-
-seqCache::seqCache()
-{
-
-}
-
-seqCache::~seqCache()
-{
-
-}
-*/
Modified: branches/soc-2013-vse/source/blender/windowmanager/SConscript
===================================================================
--- branches/soc-2013-vse/source/blender/windowmanager/SConscript 2013-09-26 04:26:12 UTC (rev 60377)
+++ branches/soc-2013-vse/source/blender/windowmanager/SConscript 2013-09-26 04:32:56 UTC (rev 60378)
@@ -35,6 +35,7 @@
'#/intern/ghost',
'#/intern/guardedalloc',
'#/intern/memutil',
+ '#/intern/opencl',
'#/source/gameengine/BlenderRoutines',
'#/extern/glew/include',
'../blenfont',
@@ -42,12 +43,14 @@
'../blenlib',
'../blenloader',
'../compositor',
+ '../cldm',
'../editors/include',
'../gpu',
'../imbuf',
'../makesdna',
'../makesrna',
'../nodes',
+ '../sequencer',
'../python',
'../render/extern/include',
env['BF_ZLIB_INC'],
More information about the Bf-blender-cvs
mailing list