Use /MD on Windows; be sure to link the PCH object file
Resolved merge conflicts