Commit: 075f60c6f53f0b59e0cb2805942684bbbec4e44e
Author: Lukas Tönne
Date: Sun Jun 19 14:50:05 2016 +0200
Branches: object_nodes
https://developer.blender.org/rB075f60c6f53f0b59e0cb2805942684bbbec4e44e
Moved old bvm codegen and function files into bvm module.
The intern and compile modules are now truly independent from backends (llvm
and bvm).
===================================================================
M source/blender/blenvm/bvm/CMakeLists.txt
A source/blender/blenvm/bvm/bvm_codegen.cc
A source/blender/blenvm/bvm/bvm_codegen.h
A source/blender/blenvm/bvm/bvm_codegen_debug.cc
A source/blender/blenvm/bvm/bvm_function.cc
A source/blender/blenvm/bvm/bvm_function.h
M source/blender/blenvm/compile/CMakeLists.txt
D source/blender/blenvm/compile/bvm_codegen.cc
D source/blender/blenvm/compile/bvm_codegen.h
D source/blender/blenvm/compile/bvm_codegen_debug.cc
D source/blender/blenvm/compile/bvm_function.cc
D source/blender/blenvm/compile/bvm_function.h
===================================================================
diff --git a/source/blender/blenvm/bvm/CMakeLists.txt
b/source/blender/blenvm/bvm/CMakeLists.txt
index ac668dd..3499dff 100644
--- a/source/blender/blenvm/bvm/CMakeLists.txt
+++ b/source/blender/blenvm/bvm/CMakeLists.txt
@@ -26,6 +26,7 @@
set(INC
.
..
+ ../compile
../intern
../modules
../util
@@ -42,6 +43,9 @@ set(INC_SYS
)
set(SRC
+ bvm_codegen.cc
+ bvm_codegen_debug.cc
+ bvm_codegen.h
bvm_eval.cc
bvm_eval.h
bvm_eval_common.h
@@ -50,6 +54,8 @@ set(SRC
bvm_eval_math.h
bvm_eval_mesh.h
bvm_eval_texture.h
+ bvm_function.h
+ bvm_function.cc
bvm_instruction_list.cc
bvm_instruction_list.h
)
diff --git a/source/blender/blenvm/compile/bvm_codegen.cc
b/source/blender/blenvm/bvm/bvm_codegen.cc
similarity index 100%
rename from source/blender/blenvm/compile/bvm_codegen.cc
rename to source/blender/blenvm/bvm/bvm_codegen.cc
diff --git a/source/blender/blenvm/compile/bvm_codegen.h
b/source/blender/blenvm/bvm/bvm_codegen.h
similarity index 100%
rename from source/blender/blenvm/compile/bvm_codegen.h
rename to source/blender/blenvm/bvm/bvm_codegen.h
diff --git a/source/blender/blenvm/compile/bvm_codegen_debug.cc
b/source/blender/blenvm/bvm/bvm_codegen_debug.cc
similarity index 100%
rename from source/blender/blenvm/compile/bvm_codegen_debug.cc
rename to source/blender/blenvm/bvm/bvm_codegen_debug.cc
diff --git a/source/blender/blenvm/compile/bvm_function.cc
b/source/blender/blenvm/bvm/bvm_function.cc
similarity index 100%
rename from source/blender/blenvm/compile/bvm_function.cc
rename to source/blender/blenvm/bvm/bvm_function.cc
diff --git a/source/blender/blenvm/compile/bvm_function.h
b/source/blender/blenvm/bvm/bvm_function.h
similarity index 100%
rename from source/blender/blenvm/compile/bvm_function.h
rename to source/blender/blenvm/bvm/bvm_function.h
diff --git a/source/blender/blenvm/compile/CMakeLists.txt
b/source/blender/blenvm/compile/CMakeLists.txt
index 9f30f4a..22f8e21 100644
--- a/source/blender/blenvm/compile/CMakeLists.txt
+++ b/source/blender/blenvm/compile/CMakeLists.txt
@@ -26,7 +26,6 @@
set(INC
.
..
- ../bvm
../intern
../util
../../blenkernel
@@ -48,12 +47,6 @@ set(SRC
node_value.h
typedesc.cc
typedesc.h
-
- bvm_codegen.cc
- bvm_codegen_debug.cc
- bvm_codegen.h
- bvm_function.h
- bvm_function.cc
)
blender_add_lib(bf_blenvm_compile "${SRC}" "${INC}" "${INC_SYS}")
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
