diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-09-18 07:55:56 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-09-18 07:55:56 +0400 |
commit | dea59cc5eb6562272df361c062f7ed226c2b7a36 (patch) | |
tree | 6186fed79ff36667e4b295d9e62621d830635540 /intern/guardedalloc | |
parent | d5e11d409f470934eb77da194f1ee43df0ff7ac2 (diff) |
warning fixes and minor cmake changes.
Diffstat (limited to 'intern/guardedalloc')
-rw-r--r-- | intern/guardedalloc/CMakeLists.txt | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/intern/guardedalloc/CMakeLists.txt b/intern/guardedalloc/CMakeLists.txt index 642b04fdb60..29e4f553974 100644 --- a/intern/guardedalloc/CMakeLists.txt +++ b/intern/guardedalloc/CMakeLists.txt @@ -26,12 +26,18 @@ SET(INC .) -FILE(GLOB SRC intern/*.c) +SET(SRC + ./intern/mallocn.c +) + +IF(WIN32) + LIST(APPEND SRC ./intern/mmap_win.c) +ENDIF(WIN32) BLENDERLIB(bf_intern_guardedalloc "${SRC}" "${INC}") -# Override C++ alloc optional +# Override C++ alloc, optional. IF(WITH_CXX_GUARDEDALLOC) - FILE(GLOB SRC cpp/*.cpp) + SET(SRC cpp/mallocn.cpp) BLENDERLIB(bf_intern_guardedalloc_cpp "${SRC}" "${INC}") ENDIF(WITH_CXX_GUARDEDALLOC) |