diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-06-25 04:49:53 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-06-25 04:49:53 +0400 |
| commit | d65ebf8c847c18f8be568eab4d5c65e7b630a40f (patch) | |
| tree | 2795070d936c6ec7012a0339ea74d1d4b317c3d4 /source/blender/blenlib/CMakeLists.txt | |
| parent | 17ee056fc6d15abc4b69a24ceac0e7f3d4dffa47 (diff) | |
| parent | a03707d408b9e37cd11124c93b1516eae9522139 (diff) | |
Merged changes in the trunk up to revision 37799.
Note for VS2008 plus CMake users:
I had to remove OpenEXR debug libs from the "blender" project properties >
Linker > Additional Dependencies. Otherwise I got a number of linker errors
concerning duplicated symbols between libcmt.lib and libcmtd.lib.
Diffstat (limited to 'source/blender/blenlib/CMakeLists.txt')
| -rw-r--r-- | source/blender/blenlib/CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt index c6bd214a2f7..9bfa6496c2f 100644 --- a/source/blender/blenlib/CMakeLists.txt +++ b/source/blender/blenlib/CMakeLists.txt @@ -53,6 +53,7 @@ set(SRC intern/DLRB_tree.c intern/boxpack2d.c intern/bpath.c + intern/callbacks.c intern/cpu.c intern/dynlib.c intern/edgehash.c @@ -90,6 +91,7 @@ set(SRC BLI_blenlib.h BLI_boxpack2d.h BLI_bpath.h + BLI_callbacks.h BLI_cpu.h BLI_dlrbTree.h BLI_dynlib.h @@ -133,12 +135,11 @@ set(SRC BLI_voxel.h BLI_winstuff.h PIL_time.h - intern/BLI_callbacks.h intern/dynamiclist.h ) if(WITH_BINRELOC) - list(APPEND INC_SYS "${BINRELOC_INC}") + list(APPEND INC_SYS "${BINRELOC_INCLUDE_DIRS}") add_definitions(-DWITH_BINRELOC) endif() |