[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54247] trunk/blender: Move opencl and reigidbody from source/blender/ to intern/
Sergey Sharybin
sergey.vfx at gmail.com
Fri Feb 1 07:24:52 CET 2013
Revision: 54247
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54247
Author: nazgul
Date: 2013-02-01 06:24:49 +0000 (Fri, 01 Feb 2013)
Log Message:
-----------
Move opencl and reigidbody from source/blender/ to intern/
This modules does not depend on any blender-specific data
structures or algorithms and due to our policy better be
placed to intern/
Shall be no functional changes, tested CMake and SCons on
Linux, hopefully other platforms will work as well.
P.S. SVN history shall be preserved for the files.
Modified Paths:
--------------
trunk/blender/intern/CMakeLists.txt
trunk/blender/intern/SConscript
trunk/blender/intern/opencl/CMakeLists.txt
trunk/blender/intern/opencl/SConscript
trunk/blender/intern/rigidbody/CMakeLists.txt
trunk/blender/intern/rigidbody/SConscript
trunk/blender/source/blender/CMakeLists.txt
trunk/blender/source/blender/SConscript
trunk/blender/source/blender/blenkernel/CMakeLists.txt
trunk/blender/source/blender/blenkernel/SConscript
trunk/blender/source/blender/compositor/CMakeLists.txt
trunk/blender/source/blender/compositor/SConscript
trunk/blender/source/blender/editors/physics/CMakeLists.txt
trunk/blender/source/blender/editors/physics/SConscript
trunk/blender/source/blender/makesrna/SConscript
trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
trunk/blender/source/blender/makesrna/intern/SConscript
trunk/blender/source/blenderplayer/CMakeLists.txt
trunk/blender/source/creator/CMakeLists.txt
Added Paths:
-----------
trunk/blender/intern/opencl/
trunk/blender/intern/rigidbody/
Removed Paths:
-------------
trunk/blender/source/blender/opencl/
trunk/blender/source/blender/rigidbody/
Modified: trunk/blender/intern/CMakeLists.txt
===================================================================
--- trunk/blender/intern/CMakeLists.txt 2013-02-01 01:11:27 UTC (rev 54246)
+++ trunk/blender/intern/CMakeLists.txt 2013-02-01 06:24:49 UTC (rev 54247)
@@ -69,6 +69,14 @@
add_subdirectory(locale)
endif()
+if(WITH_BULLET)
+ add_subdirectory(rigidbody)
+endif()
+
+if(WITH_COMPOSITOR)
+ add_subdirectory(opencl)
+endif()
+
# only windows needs utf16 converter
if(WIN32)
add_subdirectory(utfconv)
Modified: trunk/blender/intern/SConscript
===================================================================
--- trunk/blender/intern/SConscript 2013-02-01 01:11:27 UTC (rev 54246)
+++ trunk/blender/intern/SConscript 2013-02-01 06:24:49 UTC (rev 54247)
@@ -59,6 +59,12 @@
if env['WITH_BF_INTERNATIONAL']:
SConscript(['locale/SConscript'])
+if env['WITH_BF_BULLET']:
+ SConscript (['rigidbody/SConscript'])
+
+if env['WITH_BF_COMPOSITOR']:
+ SConscript (['opencl/SConscript'])
+
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-mingw', 'linuxcross', 'win64-vc'):
SConscript(['utfconv/SConscript'])
Modified: trunk/blender/intern/opencl/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/opencl/CMakeLists.txt 2013-02-01 01:11:27 UTC (rev 54246)
+++ trunk/blender/intern/opencl/CMakeLists.txt 2013-02-01 06:24:49 UTC (rev 54247)
@@ -39,4 +39,4 @@
)
-blender_add_lib(bf_opencl "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_intern_opencl "${SRC}" "${INC}" "${INC_SYS}")
Modified: trunk/blender/intern/opencl/SConscript
===================================================================
--- trunk/blender/source/blender/opencl/SConscript 2013-02-01 01:11:27 UTC (rev 54246)
+++ trunk/blender/intern/opencl/SConscript 2013-02-01 06:24:49 UTC (rev 54247)
@@ -31,4 +31,4 @@
incs = '.'
-env.BlenderLib ( 'bf_opencl', sources, Split(incs), libtype=['core','player'], priority = [192,192] )
+env.BlenderLib ( 'bf_intern_opencl', sources, Split(incs), libtype=['core','player'], priority = [192,192] )
Modified: trunk/blender/intern/rigidbody/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/rigidbody/CMakeLists.txt 2013-02-01 01:11:27 UTC (rev 54246)
+++ trunk/blender/intern/rigidbody/CMakeLists.txt 2013-02-01 06:24:49 UTC (rev 54247)
@@ -23,7 +23,7 @@
SET(INC
.
- ../../../extern/bullet2/src
+ ../../extern/bullet2/src
)
set(SRC
@@ -32,4 +32,4 @@
RBI_api.h
)
-blender_add_lib(bf_rigidbody "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_intern_rigidbody "${SRC}" "${INC}" "${INC_SYS}")
Modified: trunk/blender/intern/rigidbody/SConscript
===================================================================
--- trunk/blender/source/blender/rigidbody/SConscript 2013-02-01 01:11:27 UTC (rev 54246)
+++ trunk/blender/intern/rigidbody/SConscript 2013-02-01 06:24:49 UTC (rev 54247)
@@ -34,9 +34,9 @@
incs = [
'.',
- '../../../extern/bullet2/src',
+ '../../extern/bullet2/src',
]
-env.BlenderLib('bf_rigidbody', sources=sources,
+env.BlenderLib('bf_intern_rigidbody', sources=sources,
includes=incs, defines=[],
libtype=['core', 'player'], priority=[180, 30])
Modified: trunk/blender/source/blender/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/CMakeLists.txt 2013-02-01 01:11:27 UTC (rev 54246)
+++ trunk/blender/source/blender/CMakeLists.txt 2013-02-01 06:24:49 UTC (rev 54247)
@@ -107,12 +107,7 @@
add_subdirectory(makesdna)
add_subdirectory(makesrna)
-if(WITH_BULLET)
- add_subdirectory(rigidbody)
-endif()
-
if(WITH_COMPOSITOR)
- add_subdirectory(opencl) # later on this may be used more generally
add_subdirectory(compositor)
endif()
Modified: trunk/blender/source/blender/SConscript
===================================================================
--- trunk/blender/source/blender/SConscript 2013-02-01 01:11:27 UTC (rev 54246)
+++ trunk/blender/source/blender/SConscript 2013-02-01 06:24:49 UTC (rev 54247)
@@ -61,12 +61,8 @@
if env['WITH_BF_QUICKTIME']:
SConscript (['quicktime/SConscript'])
-if env['WITH_BF_BULLET']:
- SConscript (['rigidbody/SConscript'])
-
if env['WITH_BF_COLLADA']:
SConscript (['collada/SConscript'])
if env['WITH_BF_COMPOSITOR']:
- SConscript (['compositor/SConscript',
- 'opencl/SConscript'])
+ SConscript (['compositor/SConscript'])
Modified: trunk/blender/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenkernel/CMakeLists.txt 2013-02-01 01:11:27 UTC (rev 54246)
+++ trunk/blender/source/blender/blenkernel/CMakeLists.txt 2013-02-01 06:24:49 UTC (rev 54247)
@@ -264,7 +264,7 @@
${BULLET_INCLUDE_DIRS}
)
list(APPEND INC
- ../rigidbody
+ ../../../intern/rigidbody
)
add_definitions(-DWITH_BULLET)
endif()
Modified: trunk/blender/source/blender/blenkernel/SConscript
===================================================================
--- trunk/blender/source/blender/blenkernel/SConscript 2013-02-01 01:11:27 UTC (rev 54246)
+++ trunk/blender/source/blender/blenkernel/SConscript 2013-02-01 06:24:49 UTC (rev 54247)
@@ -41,7 +41,7 @@
incs += ' ../imbuf ../ikplugin ../avi #/intern/elbeem/extern ../nodes ../modifiers'
incs += ' #/intern/iksolver/extern ../blenloader'
incs += ' #/extern/bullet2/src'
-incs += ' ../rigidbody'
+incs += ' #/intern/rigidbody'
incs += ' #/intern/opennl/extern #/intern/bsp/extern'
incs += ' ../gpu #/extern/glew/include'
incs += ' ../bmesh'
Modified: trunk/blender/source/blender/compositor/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/compositor/CMakeLists.txt 2013-02-01 01:11:27 UTC (rev 54246)
+++ trunk/blender/source/blender/compositor/CMakeLists.txt 2013-02-01 06:24:49 UTC (rev 54247)
@@ -35,13 +35,13 @@
../imbuf
../makesdna
../makesrna
- ../opencl
../windowmanager
../nodes
../nodes/composite
../nodes/intern
../render/extern/include
../render/intern/include
+ ../../../intern/opencl
../../../intern/guardedalloc
)
Modified: trunk/blender/source/blender/compositor/SConscript
===================================================================
--- trunk/blender/source/blender/compositor/SConscript 2013-02-01 01:11:27 UTC (rev 54246)
+++ trunk/blender/source/blender/compositor/SConscript 2013-02-01 06:24:49 UTC (rev 54247)
@@ -32,7 +32,7 @@
incs = '. nodes intern operations ../blenlib ../blenkernel ../makesdna ../render/extern/include ../render/intern/include'
incs += ' ../makesrna ../blenloader ../../../intern/guardedalloc ../imbuf ../windowmanager '
-incs += '../opencl ../nodes ../nodes/intern ../nodes/composite '
+incs += '#intern/opencl ../nodes ../nodes/intern ../nodes/composite '
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
incs += ' ' + env['BF_PTHREADS_INC']
Modified: trunk/blender/source/blender/editors/physics/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/physics/CMakeLists.txt 2013-02-01 01:11:27 UTC (rev 54246)
+++ trunk/blender/source/blender/editors/physics/CMakeLists.txt 2013-02-01 06:24:49 UTC (rev 54247)
@@ -64,7 +64,7 @@
if(WITH_BULLET)
list(APPEND INC
- ../../rigidbody
+ ../../../../intern/rigidbody
)
add_definitions(-DWITH_BULLET)
endif()
Modified: trunk/blender/source/blender/editors/physics/SConscript
===================================================================
--- trunk/blender/source/blender/editors/physics/SConscript 2013-02-01 01:11:27 UTC (rev 54246)
+++ trunk/blender/source/blender/editors/physics/SConscript 2013-02-01 06:24:49 UTC (rev 54247)
@@ -33,7 +33,7 @@
incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'
incs += ' ../../gpu ../../blenloader ../../bmesh'
incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern'
-incs += ' ../../rigidbody'
+incs += ' #/intern/rigidbody'
defs = []
Modified: trunk/blender/source/blender/makesrna/SConscript
===================================================================
--- trunk/blender/source/blender/makesrna/SConscript 2013-02-01 01:11:27 UTC (rev 54246)
+++ trunk/blender/source/blender/makesrna/SConscript 2013-02-01 06:24:49 UTC (rev 54247)
@@ -38,7 +38,6 @@
incs += ' ../nodes'
incs += ' #/extern/glew/include'
incs += ' #/intern/smoke/extern'
-incs += ' ../rigidbody'
incs += ' ../bmesh'
@@ -49,7 +48,7 @@
if env['WITH_BF_BULLET']:
defs.append('WITH_BULLET')
- incs += ' ../../rigidbody'
+ incs += ' #/intern/rigidbody'
if env['WITH_BF_OPENEXR']:
defs.append('WITH_OPENEXR')
Modified: trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/makesrna/intern/CMakeLists.txt 2013-02-01 01:11:27 UTC (rev 54246)
+++ trunk/blender/source/blender/makesrna/intern/CMakeLists.txt 2013-02-01 06:24:49 UTC (rev 54247)
@@ -240,7 +240,7 @@
if(WITH_BULLET)
list(APPEND INC
- ../../rigidbody
+ ../../../../intern/rigidbody
)
add_definitions(-DWITH_BULLET)
endif()
Modified: trunk/blender/source/blender/makesrna/intern/SConscript
===================================================================
--- trunk/blender/source/blender/makesrna/intern/SConscript 2013-02-01 01:11:27 UTC (rev 54246)
+++ trunk/blender/source/blender/makesrna/intern/SConscript 2013-02-01 06:24:49 UTC (rev 54247)
@@ -68,7 +68,7 @@
if env['WITH_BF_BULLET']:
defs.append('WITH_BULLET')
- incs += ' ../../rigidbody'
+ incs += ' #/intern/rigidbody'
if env['WITH_BF_OPENEXR']:
defs.append('WITH_OPENEXR')
Modified: trunk/blender/source/blenderplayer/CMakeLists.txt
===================================================================
--- trunk/blender/source/blenderplayer/CMakeLists.txt 2013-02-01 01:11:27 UTC (rev 54246)
+++ trunk/blender/source/blenderplayer/CMakeLists.txt 2013-02-01 06:24:49 UTC (rev 54247)
@@ -95,7 +95,7 @@
bf_rna
bf_bmesh
bf_blenkernel
- bf_rigidbody
+ bf_intern_rigidbody
bf_blenloader
ge_blen_routines
bf_editor_datafiles
Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list