enable building on 64bit windows
Merge branch 'x64'