Merge branch 'blender-v2.82-release'
This commit is contained in:
@@ -37,6 +37,9 @@ set(LIB
|
||||
bf_intern_opencolorio # Should not be needed but gives windows linker errors if the ocio libs are linked before this
|
||||
bf_gpu # Should not be needed but gives windows linker errors if the ocio libs are linked before this
|
||||
bf_alembic
|
||||
|
||||
${OPENEXR_LIBRARIES}
|
||||
${BOOST_LIBRARIES}
|
||||
)
|
||||
|
||||
include_directories(${INC})
|
||||
|
@@ -27,6 +27,7 @@ set(INC
|
||||
../../../intern/atomic
|
||||
)
|
||||
|
||||
setup_libdirs()
|
||||
include_directories(${INC})
|
||||
|
||||
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${PLATFORM_LINKFLAGS}")
|
||||
|
@@ -52,6 +52,9 @@ set(LIB
|
||||
bf_gpu
|
||||
|
||||
bf_usd
|
||||
|
||||
${BOOST_LIBRARIES}
|
||||
${TBB_LIBRARIES}
|
||||
)
|
||||
|
||||
include_directories(${INC})
|
||||
|
Reference in New Issue
Block a user