forked from bartvdbraak/blender
Compile fixes for recent boost changes
This commit is contained in:
parent
b2f837896d
commit
8d0b2bc17f
@ -33,6 +33,7 @@ set(INC_SYS
|
|||||||
../../../extern/bullet2/src
|
../../../extern/bullet2/src
|
||||||
${PTHREADS_INCLUDE_DIRS}
|
${PTHREADS_INCLUDE_DIRS}
|
||||||
${GLEW_INCLUDE_PATH}
|
${GLEW_INCLUDE_PATH}
|
||||||
|
${BOOST_INCLUDE_DIR}
|
||||||
)
|
)
|
||||||
|
|
||||||
set(SRC
|
set(SRC
|
||||||
|
@ -34,6 +34,7 @@ if env['WITH_BF_CXX_GUARDEDALLOC']:
|
|||||||
|
|
||||||
incs += ' ' + env['BF_BULLET_INC']
|
incs += ' ' + env['BF_BULLET_INC']
|
||||||
incs += ' ' + env['BF_OPENGL_INC']
|
incs += ' ' + env['BF_OPENGL_INC']
|
||||||
|
incs += ' ' + env['BF_BOOST_INC']
|
||||||
|
|
||||||
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
|
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
|
||||||
incs += ' ' + env['BF_PTHREADS_INC']
|
incs += ' ' + env['BF_PTHREADS_INC']
|
||||||
|
@ -59,7 +59,7 @@ set(INC_SYS
|
|||||||
../../../extern/recastnavigation/Detour/Include
|
../../../extern/recastnavigation/Detour/Include
|
||||||
../../../extern/Eigen3
|
../../../extern/Eigen3
|
||||||
${PTHREADS_INCLUDE_DIRS}
|
${PTHREADS_INCLUDE_DIRS}
|
||||||
|
${BOOST_INCLUDE_DIR}
|
||||||
)
|
)
|
||||||
|
|
||||||
set(SRC
|
set(SRC
|
||||||
|
@ -24,6 +24,7 @@ incs += ' #extern/recastnavigation/Detour/Include'
|
|||||||
incs += ' #extern/Eigen3'
|
incs += ' #extern/Eigen3'
|
||||||
|
|
||||||
incs += ' ' + env['BF_BULLET_INC']
|
incs += ' ' + env['BF_BULLET_INC']
|
||||||
|
incs += ' ' + env['BF_BOOST_INC']
|
||||||
|
|
||||||
if env['BF_DEBUG']:
|
if env['BF_DEBUG']:
|
||||||
if env['OURPLATFORM'] in ('win32-mingw', 'win32-vc', 'win64-vc', 'win64-mingw'):
|
if env['OURPLATFORM'] in ('win32-mingw', 'win32-vc', 'win64-vc', 'win64-mingw'):
|
||||||
|
@ -57,6 +57,7 @@ set(INC
|
|||||||
set(INC_SYS
|
set(INC_SYS
|
||||||
${PTHREADS_INCLUDE_DIRS}
|
${PTHREADS_INCLUDE_DIRS}
|
||||||
${GLEW_INCLUDE_PATH}
|
${GLEW_INCLUDE_PATH}
|
||||||
|
${BOOST_INCLUDE_DIR}
|
||||||
../../../extern/recastnavigation/Recast/Include
|
../../../extern/recastnavigation/Recast/Include
|
||||||
../../../extern/recastnavigation/Detour/Include
|
../../../extern/recastnavigation/Detour/Include
|
||||||
)
|
)
|
||||||
|
@ -24,6 +24,7 @@ incs += ' #extern/recastnavigation/Recast/Include #extern/recastnavigation/Detou
|
|||||||
|
|
||||||
incs += ' ' + env['BF_BULLET_INC']
|
incs += ' ' + env['BF_BULLET_INC']
|
||||||
incs += ' ' + env['BF_OPENGL_INC']
|
incs += ' ' + env['BF_OPENGL_INC']
|
||||||
|
incs += ' ' + env['BF_BOOST_INC']
|
||||||
|
|
||||||
if env['WITH_BF_SDL']:
|
if env['WITH_BF_SDL']:
|
||||||
incs += ' ' + env['BF_SDL_INC']
|
incs += ' ' + env['BF_SDL_INC']
|
||||||
|
Loading…
Reference in New Issue
Block a user