Move opencl and reigidbody from source/blender/ to intern/
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 1 Feb 2013 06:24:49 +0000 (06:24 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 1 Feb 2013 06:24:49 +0000 (06:24 +0000)
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.

25 files changed:
intern/CMakeLists.txt
intern/SConscript
intern/opencl/CMakeLists.txt [moved from source/blender/opencl/CMakeLists.txt with 94% similarity]
intern/opencl/OCL_opencl.h [moved from source/blender/opencl/OCL_opencl.h with 100% similarity]
intern/opencl/SConscript [moved from source/blender/opencl/SConscript with 90% similarity]
intern/opencl/intern/OCL_opencl.c [moved from source/blender/opencl/intern/OCL_opencl.c with 100% similarity]
intern/opencl/intern/clew.c [moved from source/blender/opencl/intern/clew.c with 100% similarity]
intern/opencl/intern/clew.h [moved from source/blender/opencl/intern/clew.h with 100% similarity]
intern/rigidbody/CMakeLists.txt [moved from source/blender/rigidbody/CMakeLists.txt with 91% similarity]
intern/rigidbody/RBI_api.h [moved from source/blender/rigidbody/RBI_api.h with 100% similarity]
intern/rigidbody/SConscript [moved from source/blender/rigidbody/SConscript with 93% similarity]
intern/rigidbody/rb_bullet_api.cpp [moved from source/blender/rigidbody/rb_bullet_api.cpp with 100% similarity]
source/blender/CMakeLists.txt
source/blender/SConscript
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/compositor/CMakeLists.txt
source/blender/compositor/SConscript
source/blender/editors/physics/CMakeLists.txt
source/blender/editors/physics/SConscript
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/SConscript
source/blenderplayer/CMakeLists.txt
source/creator/CMakeLists.txt

index be797c45ba12f92e9274cf15457cbc83989b0f00..bb8cd7aaf70fb83aeb446c8182606374fe8f9396 100644 (file)
@@ -69,6 +69,14 @@ if(WITH_INTERNATIONAL)
        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)
index a35c99bbbaa5e817c44ea4c33e6c1293dae08fa7..828c1adc20dbb987543bc80aa7df3afa1c8e068d 100644 (file)
@@ -59,6 +59,12 @@ if env['WITH_BF_BOOLEAN']:
 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'])
 
similarity index 94%
rename from source/blender/opencl/CMakeLists.txt
rename to intern/opencl/CMakeLists.txt
index b3c76db1bcaa0ed9a3c04b5039aa2b3896360e06..03855cfdf8bfb5b5bbf38fd299ac83c9ff6959bb 100644 (file)
@@ -39,4 +39,4 @@ set(SRC
 )
 
 
-blender_add_lib(bf_opencl "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_intern_opencl "${SRC}" "${INC}" "${INC_SYS}")
similarity index 90%
rename from source/blender/opencl/SConscript
rename to intern/opencl/SConscript
index 388789a5b50944687e8587e3589afdeb10f9f2eb..41a6d720098520a33d3c4a1756ac93ec039b8d41 100644 (file)
@@ -31,4 +31,4 @@ sources = env.Glob('intern/*.c')
 
 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] )
similarity index 91%
rename from source/blender/rigidbody/CMakeLists.txt
rename to intern/rigidbody/CMakeLists.txt
index 903fbe66f01e65a49c4d05bd02164e05391908ed..a323e55e570dc5ef0a26385aaf6c9c797433fba9 100644 (file)
@@ -23,7 +23,7 @@
 
 SET(INC
        .
-       ../../../extern/bullet2/src
+       ../../extern/bullet2/src
 )
 
 set(SRC
@@ -32,4 +32,4 @@ set(SRC
        RBI_api.h
 )
 
-blender_add_lib(bf_rigidbody "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib(bf_intern_rigidbody "${SRC}" "${INC}" "${INC_SYS}")
similarity index 93%
rename from source/blender/rigidbody/SConscript
rename to intern/rigidbody/SConscript
index 14c8030498322d780a6ae469f3c50e32a324a8f4..977281f8eef1120619d23c5035c0776c5f8df8b2 100644 (file)
@@ -34,9 +34,9 @@ sources = env.Glob('*.cpp')
 
 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])
index 36b05fd31f43bca2102ae99d62b90ebfea8d63d0..50e13188965fa3cf9a57f72911620396abab05c3 100644 (file)
@@ -107,12 +107,7 @@ add_subdirectory(modifiers)
 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()
 
index 80457c739b6d7316112746521f266e297fad35c6..8a4e2a39aa166d431bbb8f55683e8b8388159637 100644 (file)
@@ -61,12 +61,8 @@ if env['WITH_BF_OPENEXR']:
 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'])
index fefd4c89fbe330b5b16afad33a46b1590c95f3da..cb6da194dad71e10d8abd54e5ccb1968b67d5beb 100644 (file)
@@ -264,7 +264,7 @@ if(WITH_BULLET)
                ${BULLET_INCLUDE_DIRS}
        )
        list(APPEND INC
-               ../rigidbody
+               ../../../intern/rigidbody
        )
        add_definitions(-DWITH_BULLET)
 endif()
index e53e4724071e765344b40522dc3305fbd39e2f41..aa7d8a51b8cabec2e757dd728597ea1cf8c78021 100644 (file)
@@ -41,7 +41,7 @@ incs += ' ../render/extern/include ../makesrna'
 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'
index 0e8ddf4068ca697e5b3301e3356a9baf2e72d4e9..efecf1a7565144125ee165bd981cc2696a09fa0b 100644 (file)
@@ -35,13 +35,13 @@ set(INC
        ../imbuf
        ../makesdna
        ../makesrna
-       ../opencl
        ../windowmanager
        ../nodes
        ../nodes/composite
        ../nodes/intern
        ../render/extern/include
        ../render/intern/include
+       ../../../intern/opencl
        ../../../intern/guardedalloc
 )
 
index 1872bf2afac70b411581eee3a431be79997f8675..64169ac74037364fee376db4ee71817857f289a6 100644 (file)
@@ -32,7 +32,7 @@ sources = env.Glob('intern/*.cpp') + env.Glob('nodes/*.cpp') + env.Glob('operati
 
 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']
index 435327319aa1f90fc780d6bd81186047d56a4a8a..29d8aec4224c10323392420512b290566b43cdab 100644 (file)
@@ -64,7 +64,7 @@ endif()
 
 if(WITH_BULLET)
        list(APPEND INC
-               ../../rigidbody
+               ../../../../intern/rigidbody
        )
        add_definitions(-DWITH_BULLET)
 endif()
index b68cc944925e6666a39cf97d2f02a4c8c00279e0..7916ea24bdeff7265942c5e817575d82e6855a24 100644 (file)
@@ -33,7 +33,7 @@ incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna
 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 = []
 
index 47750617e552f5fca9e3f7301344756150738d2c..6031e797905b6c56779c2aff50ad0a8d0a78f949 100644 (file)
@@ -38,7 +38,6 @@ incs += ' ../render/extern/include #/intern/cycles/blender'
 incs += ' ../nodes'
 incs += ' #/extern/glew/include'
 incs += ' #/intern/smoke/extern'
-incs += ' ../rigidbody'
 
 incs += ' ../bmesh'
 
@@ -49,7 +48,7 @@ if env['WITH_BF_SMOKE']:
 
 if env['WITH_BF_BULLET']:
     defs.append('WITH_BULLET')
-    incs += ' ../../rigidbody'
+    incs += ' #/intern/rigidbody'
 
 if env['WITH_BF_OPENEXR']:
     defs.append('WITH_OPENEXR')
index 210857a4690260d1f4b20c4b38bd399dad623a54..849c61f30b3332ef1c81a2141a2566f39cb79b68 100644 (file)
@@ -240,7 +240,7 @@ endif()
 
 if(WITH_BULLET)
        list(APPEND INC
-               ../../rigidbody
+               ../../../../intern/rigidbody
        )
        add_definitions(-DWITH_BULLET)
 endif()
index 33d43e1e019e4aca1ccfbeca74a9427c62c46930..f8608f0c28bfead771e20d8e9450e4ed1d86aa04 100644 (file)
@@ -68,7 +68,7 @@ if env['WITH_BF_SMOKE']:
 
 if env['WITH_BF_BULLET']:
     defs.append('WITH_BULLET')
-    incs += ' ../../rigidbody'
+    incs += ' #/intern/rigidbody'
 
 if env['WITH_BF_OPENEXR']:
     defs.append('WITH_OPENEXR')
index b2a471156301165d616bd00dd4c33f6b26df9d56..fb06c5e44775b01ea4bdf1dedb0f1ced1ffac7e7 100644 (file)
@@ -95,7 +95,7 @@ endif()
                bf_rna
                bf_bmesh
                bf_blenkernel
-               bf_rigidbody
+               bf_intern_rigidbody
                bf_blenloader
                ge_blen_routines
                bf_editor_datafiles
index 2115b2a5ff66a6f2d6c43a56b035e3c28352d40b..bb5f34167bc7dfcceb666f5a779ff5f81e8262f1 100644 (file)
@@ -918,7 +918,7 @@ endif()
        if(WITH_COMPOSITOR)
                # added for opencl compositor
                list_insert_before(BLENDER_SORTED_LIBS "bf_blenkernel" "bf_compositor")
-               list_insert_after(BLENDER_SORTED_LIBS "bf_compositor" "bf_opencl")
+               list_insert_after(BLENDER_SORTED_LIBS "bf_compositor" "bf_intern_opencl")
        endif()
 
        if(WITH_LIBMV)
@@ -971,7 +971,7 @@ endif()
        endif()
 
        if(WITH_BULLET)
-               list_insert_after(BLENDER_SORTED_LIBS "bf_blenkernel" "bf_rigidbody")
+               list_insert_after(BLENDER_SORTED_LIBS "bf_blenkernel" "bf_intern_rigidbody")
        endif()
 
        if(WITH_BULLET AND NOT WITH_BULLET_SYSTEM)