fix compile error on win32
update vcproj
Merge branch 'release/2.2.0/windows' into develop