Simplify architecture detection for 64/32 bits on Windows.

Merged Julien Wadel requested to merge fix/win_archs_selection into release/5.1

Merge request reports