Localization should not depend on debug locale library

Linking happens fine, but blender crashes on startup -- crash with familiar
backtrace happens with i18n disabled (in that case it's something to do with OIIO).
This commit is contained in:
Sergey Sharybin
2012-11-19 13:15:11 +00:00
parent 3b570440e4
commit 9947f70f19
2 changed files with 3 additions and 2 deletions

View File

@@ -1108,8 +1108,8 @@ elseif(WIN32)
#debug libboost_regex-${BOOST_DEBUG_POSTFIX}
#debug libboost_system-${BOOST_DEBUG_POSTFIX} debug libboost_thread-${BOOST_DEBUG_POSTFIX}
if(WITH_INTERNATIONAL)
set(BOOST_LIBRARIES ${BOOST_LIBRARIES}
optimized libboost_locale-${BOOST_POSTFIX})
set(BOOST_LIBRARIES ${BOOST_LIBRARIES} libboost_locale-${BOOST_POSTFIX})
#optimized libboost_locale-${BOOST_POSTFIX})
#debug libboost_locale-${BOOST_DEBUG_POSTFIX}
endif(WITH_INTERNATIONAL)
set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB")

View File

@@ -39,6 +39,7 @@ if(WITH_INTERNATIONAL)
${BOOST_INCLUDE_DIR}
)
add_definitions(-DWITH_INTERNATIONAL)
add_definitions(${BOOST_DEFINITIONS})
endif()
blender_add_lib(bf_intern_locale "${SRC}" "${INC}" "${INC_SYS}")