Completed windows build on win7-64