[Bf-blender-cvs] [f1de438] master: Revert "[Windows/MSVC] Blosc doesn't require debug libraries."

lazydodo noreply at git.blender.org
Thu Sep 29 01:29:04 CEST 2016


Commit: f1de438bba0fd6b525ea04d094b8a08737144e82
Author: lazydodo
Date:   Wed Sep 28 17:27:35 2016 -0600
Branches: master
https://developer.blender.org/rBf1de438bba0fd6b525ea04d094b8a08737144e82

Revert "[Windows/MSVC] Blosc doesn't require debug libraries."

turns out it's a C++ lib now-days and it *DOES* require debug libs.

This reverts commit bde5eb8b6303d8d92b7c41d4a3f041bbb73c162d.

===================================================================

M	build_files/cmake/platform/platform_win32_msvc.cmake

===================================================================

diff --git a/build_files/cmake/platform/platform_win32_msvc.cmake b/build_files/cmake/platform/platform_win32_msvc.cmake
index 961cada..5efda52 100644
--- a/build_files/cmake/platform/platform_win32_msvc.cmake
+++ b/build_files/cmake/platform/platform_win32_msvc.cmake
@@ -414,7 +414,7 @@ if(WITH_OPENCOLORIO)
 endif()
 
 if(WITH_OPENVDB)
-	set(BLOSC_LIBRARIES ${LIBDIR}/blosc/lib/libblosc.lib )
+	set(BLOSC_LIBRARIES optimized ${LIBDIR}/blosc/lib/libblosc.lib debug ${LIBDIR}/blosc/lib/libblosc_d.lib)
 	set(TBB_LIBRARIES optimized ${LIBDIR}/tbb/lib/tbb.lib debug ${LIBDIR}/tbb/lib/tbb_debug.lib)
 	set(TBB_INCLUDE_DIR ${LIBDIR}/tbb/include)
 	set(OPENVDB ${LIBDIR}/openvdb)




More information about the Bf-blender-cvs mailing list