Lock-free memory allocator

[blender-staging.git] / intern / guardedalloc / CMakeLists.txt

diff --git a/intern/guardedalloc/CMakeLists.txt b/intern/guardedalloc/CMakeLists.txt
index 1e140c5b674fae42d03d3b9d7475572da8d1f9d8..b7a59da781388341730bfc5ea2111408c607498a 100644 (file)
--- a/intern/guardedalloc/CMakeLists.txt
+++ b/intern/guardedalloc/CMakeLists.txt
@@ -34,11 +34,11 @@ set(INC_SYS
 
 set(SRC
        ./intern/mallocn.c
+       ./intern/mallocn_guarded_impl.c
+       ./intern/mallocn_lockfree_impl.c
 
        MEM_guardedalloc.h
-
-       # include here since its a header-only
-       ../atomic/atomic_ops.h
+       ./intern/mallocn_intern.h
 )
 
 if(WIN32 AND NOT UNIX)
@@ -49,12 +49,6 @@ if(WIN32 AND NOT UNIX)
        )
 endif()
 
-if (WITH_GUARDEDALLOC)
-       add_definitions(-DWITH_GUARDEDALLOC)
-else()
-       message(WARNING "Disabling GuardedAlloc is experemental, use at own risk!")
-endif()
-
 blender_add_lib(bf_intern_guardedalloc "${SRC}" "${INC}" "${INC_SYS}")
 
 # Override C++ alloc, optional.