diff options
| -rw-r--r-- | intern/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | intern/cycles/kernel/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | intern/guardedalloc/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/treehash.c | 30 |
4 files changed, 35 insertions, 0 deletions
diff --git a/intern/CMakeLists.txt b/intern/CMakeLists.txt index bb8cd7aaf70..69d6e253fd0 100644 --- a/intern/CMakeLists.txt +++ b/intern/CMakeLists.txt @@ -23,6 +23,7 @@ # # ***** END GPL LICENSE BLOCK ***** +# add_subdirectory(atomic) # header only add_subdirectory(string) add_subdirectory(ghost) add_subdirectory(guardedalloc) diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt index 963ec652784..40cae22ed97 100644 --- a/intern/cycles/kernel/CMakeLists.txt +++ b/intern/cycles/kernel/CMakeLists.txt @@ -22,6 +22,7 @@ set(SRC_HEADERS kernel.h kernel_accumulate.h kernel_bvh.h + kernel_bvh_subsurface.h kernel_bvh_traversal.h kernel_camera.h kernel_compat_cpu.h diff --git a/intern/guardedalloc/CMakeLists.txt b/intern/guardedalloc/CMakeLists.txt index 7ac978b0edd..1e140c5b674 100644 --- a/intern/guardedalloc/CMakeLists.txt +++ b/intern/guardedalloc/CMakeLists.txt @@ -36,6 +36,9 @@ set(SRC ./intern/mallocn.c MEM_guardedalloc.h + + # include here since its a header-only + ../atomic/atomic_ops.h ) if(WIN32 AND NOT UNIX) diff --git a/source/blender/blenkernel/intern/treehash.c b/source/blender/blenkernel/intern/treehash.c index 3d763b22e26..19a9ede31ea 100644 --- a/source/blender/blenkernel/intern/treehash.c +++ b/source/blender/blenkernel/intern/treehash.c @@ -1,3 +1,33 @@ +/* + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * Contributor(s): Blender Foundation 2013 + * + * ***** END GPL LICENSE BLOCK ***** + */ + +/** \file treehash.c + * \ingroup bke + * + * Tree hash for the outliner space. + */ + +#include <stdlib.h> + #include "BKE_treehash.h" #include "BLI_ghash.h" |