diff --git a/build/vc2013/nana.vcxproj b/build/vc2013/nana.vcxproj
index ea824f68..03fe61cb 100644
--- a/build/vc2013/nana.vcxproj
+++ b/build/vc2013/nana.vcxproj
@@ -67,32 +67,32 @@
- ../bin/vc2013/
+ ../bin/
..\..\include;$(IncludePath)
..\..\source;$(VC_SourcePath);
$(ProjectName)_$(PlatformToolset)_$(Configuration)_$(PlatformShortName)
- ..\..\..\temp\$(PlatformToolset)_$(Configuration)_$(PlatformShortName)\
+ ..\..\..\temp\$(ProjectName)\$(PlatformToolset)_$(Configuration)_$(PlatformShortName)\
..\..\include;$(IncludePath)
..\..\source;$(VC_SourcePath);
- ../bin/vc2013/
+ ../bin/
$(ProjectName)_$(PlatformToolset)_$(Configuration)_$(PlatformShortName)
- ..\..\..\temp\$(PlatformToolset)_$(Configuration)_$(PlatformShortName)\
+ ..\..\..\temp\$(ProjectName)\$(PlatformToolset)_$(Configuration)_$(PlatformShortName)\
- ../bin/vc2013/
+ ../bin/
..\..\include;$(IncludePath)
..\..\source;$(VC_SourcePath);
$(ProjectName)_$(PlatformToolset)_$(Configuration)_$(PlatformShortName)
- ..\..\..\temp\$(PlatformToolset)_$(Configuration)_$(PlatformShortName)\
+ ..\..\..\temp\$(ProjectName)\$(PlatformToolset)_$(Configuration)_$(PlatformShortName)\
..\..\include;$(IncludePath)
..\..\source;$(VC_SourcePath);
- ../bin/vc2013/
+ ../bin/
$(ProjectName)_$(PlatformToolset)_$(Configuration)_$(PlatformShortName)
- ..\..\..\temp\$(PlatformToolset)_$(Configuration)_$(PlatformShortName)\
+ ..\..\..\temp\$(ProjectName)\$(PlatformToolset)_$(Configuration)_$(PlatformShortName)\
diff --git a/include/nana/config.hpp b/include/nana/config.hpp
index 77b9005c..30ae2dc5 100644
--- a/include/nana/config.hpp
+++ b/include/nana/config.hpp
@@ -13,6 +13,21 @@
#ifndef NANA_CONFIG_HPP
#define NANA_CONFIG_HPP
+
+#if defined(_MSC_VER)
+ #define _SCL_SECURE_NO_WARNINGS
+ #define _CRT_SECURE_NO_DEPRECATE
+ #pragma warning(disable : 4996)
+ #if (_MSC_VER == 1900)
+ // google: break any code that tries to use codecvt or codecvt.
+ // google: It appears the C++ libs haven't been compiled with native char16_t/char32_t support.
+ // google: Those definitions are for codecvt::id, codecvt::id and codecvt::id respectively.
+ // However, the codecvt::id and codecvt::id definitions aren't there, and indeed, if you look at locale0.cpp in the CRT source code you'll see they're not defined at all.
+ // google: That's a known issue, tracked by an active bug (DevDiv#1060849). We were able to update the STL's headers in response to char16_t/char32_t, but we still need to update the separately compiled sources.
+ #define STD_CODECVT_NOT_SUPPORTED
+ #endif // _MSC_VER == 1900
+#endif // _MSVC
+
//Select platform automatically
#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
//Windows:
@@ -35,7 +50,7 @@
#define PLATFORM_SPEC_HPP
#define STD_CODECVT_NOT_SUPPORTED
#else
-# static_assert(false, "Only Windows and Unix are support now");
+# static_assert(false, "Only Windows and Unix are supported now");
#endif
#if defined(NANA_MINGW) || defined(NANA_LINUX)