svn merge -r37028:37030 https://svn.blender.org/svnroot/bf-blender/trunk/blender
This commit is contained in:
@@ -25,6 +25,9 @@ set(INC
|
||||
../../blenkernel
|
||||
../../blenloader
|
||||
../../../../intern/guardedalloc
|
||||
)
|
||||
|
||||
set(INC_SYS
|
||||
${GLEW_INCLUDE_PATH}
|
||||
${PYTHON_INCLUDE_DIRS}
|
||||
)
|
||||
@@ -60,4 +63,4 @@ set(SRC
|
||||
)
|
||||
|
||||
|
||||
blender_add_lib(bf_python_ext "${SRC}" "${INC}")
|
||||
blender_add_lib(bf_python_ext "${SRC}" "${INC}" "${INC_SYS}")
|
||||
|
||||
@@ -34,6 +34,9 @@ set(INC
|
||||
../../editors/include
|
||||
../../../../intern/guardedalloc
|
||||
../../../../intern/audaspace/intern
|
||||
)
|
||||
|
||||
set(INC_SYS
|
||||
${PYTHON_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
@@ -81,4 +84,4 @@ if(WITH_PYTHON_SAFETY)
|
||||
add_definitions(-DWITH_PYTHON_SAFETY)
|
||||
endif()
|
||||
|
||||
blender_add_lib(bf_python "${SRC}" "${INC}")
|
||||
blender_add_lib(bf_python "${SRC}" "${INC}" "${INC_SYS}")
|
||||
|
||||
Reference in New Issue
Block a user