Merge branch 'roberthauck-patch-1' into hotfix-1.1.3

This commit is contained in:
Jinhao 2015-09-14 01:51:06 +08:00
commit fc307d5b99

View File

@ -36,6 +36,11 @@ if(BIICODE)
# More MSVC specific compilation flags # More MSVC specific compilation flags
add_definitions(-D_SCL_SECURE_NO_WARNINGS) add_definitions(-D_SCL_SECURE_NO_WARNINGS)
add_definitions(-D_CRT_SECURE_NO_DEPRECATE) add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
if(MSVC14)
add_definitions(-DSTD_CODECVT_NOT_SUPPORTED)
else()
add_definitions(-DNOT_IMPLEMENTED_KEYWORD_noexcept)
endif()
endif() endif()
add_biicode_targets() add_biicode_targets()