svn merge -r37028:37030 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-05-31 05:28:00 +00:00
parent 08d6932c86 09da9d4393
commit 8949387186
103 changed files with 600 additions and 232 deletions
--- a/source/blender/editors/space_info/CMakeLists.txt
+++ b/source/blender/editors/space_info/CMakeLists.txt
@@ -31,6 +31,9 @@ set(INC
 	../../makesrna
 	../../windowmanager
 	../../../../intern/guardedalloc
+)
+
+set(INC_SYS
 	${GLEW_INCLUDE_PATH}
 )

@@ -46,4 +49,4 @@ set(SRC
 	textview.h
 )

-blender_add_lib(bf_editor_space_info "${SRC}" "${INC}")
+blender_add_lib(bf_editor_space_info "${SRC}" "${INC}" "${INC_SYS}")