Try to make more of this build with msvc