diff options
author | Mitchell Stokes <mogurijin@gmail.com> | 2011-07-29 10:32:30 +0400 |
---|---|---|
committer | Mitchell Stokes <mogurijin@gmail.com> | 2011-07-29 10:32:30 +0400 |
commit | b46d8955509e805f06b76a6fd800ecb4edee113b (patch) | |
tree | 7ed0b1a3b5d04ab48d3e9062ff02ce54961ecb06 /source/blender/blenlib/CMakeLists.txt | |
parent | 6960127d2609620d52620539388ada5cb466bab2 (diff) | |
parent | 26589497529ca3c8da85391d4976d286a371e258 (diff) |
Merging r36529-38806bge_components
Diffstat (limited to 'source/blender/blenlib/CMakeLists.txt')
-rw-r--r-- | source/blender/blenlib/CMakeLists.txt | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt index b7827d62851..b4fc983008c 100644 --- a/source/blender/blenlib/CMakeLists.txt +++ b/source/blender/blenlib/CMakeLists.txt @@ -26,12 +26,15 @@ set(INC . - ../makesdna ../blenkernel ../blenloader ../gpu + ../makesdna ../../../intern/ghost ../../../intern/guardedalloc +) + +set(INC_SYS ${ZLIB_INCLUDE_DIRS} ${FREETYPE_INCLUDE_DIRS} ) @@ -49,6 +52,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 @@ -86,6 +90,7 @@ set(SRC BLI_blenlib.h BLI_boxpack2d.h BLI_bpath.h + BLI_callbacks.h BLI_cpu.h BLI_dlrbTree.h BLI_dynlib.h @@ -129,17 +134,18 @@ 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_INCLUDE_DIRS} + ) add_definitions(-DWITH_BINRELOC) - list(APPEND INC "${BINRELOC_INC}") endif() if(WITH_OPENMP) add_definitions(-DPARALLEL=1) endif() -blender_add_lib(bf_blenlib "${SRC}" "${INC}") +blender_add_lib(bf_blenlib "${SRC}" "${INC}" "${INC_SYS}") |