Switch to unified view

a/Makefile.vc b/Makefile.vc