Update for non-CMake Visual 2015