Merge pull request #19373 from Microsoft/jjh/makefile

Windows: Update makefile