diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-06-11 04:22:10 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-06-11 04:22:10 +0400 |
| commit | 32c7e22d3696e3575f4b7d05c1f7140591e88809 (patch) | |
| tree | 44d501cb62aebd638a7f7b5d0306ecc03e0deb5f /source/blender/freestyle/CMakeLists.txt | |
| parent | dfcd01553536d63dab1037d0ea289b9d9d90c39c (diff) | |
| parent | 6fb82a85c9a48c9fad6cb7b42994a9cd7b2b491a (diff) | |
Merged changes in the trunk up to revision 37388.
Conflicts resolved:
release/scripts/startup/bl_ui/properties_render.py
source/creator/SConscript
source/blender/blenlib/intern/bpath.c
source/blender/editors/space_outliner/outliner.c
Diffstat (limited to 'source/blender/freestyle/CMakeLists.txt')
| -rw-r--r-- | source/blender/freestyle/CMakeLists.txt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/freestyle/CMakeLists.txt b/source/blender/freestyle/CMakeLists.txt index a4a94883b01..0bbccd0fca4 100644 --- a/source/blender/freestyle/CMakeLists.txt +++ b/source/blender/freestyle/CMakeLists.txt @@ -31,12 +31,15 @@ set(INC ../python ../python/intern ../render/extern/include ../render/intern/include ../include ../src ../../../extern/glew/include ../../../intern/guardedalloc ../freestyle +) + +set(INC_SYS ${PYTHON_INCLUDE_DIRS} ${PNG_INC} ) if(WIN32) - set(INC ${INC} ${PTHREADS_INC}) + set(INC_SYS ${INC_SYS} ${PTHREADS_INC}) endif(WIN32) -blender_add_lib(bf_freestyle "${SRC}" "${INC}") +blender_add_lib(bf_freestyle "${SRC}" "${INC}" "${INC_SYS}") |