Improve win32 build system
Fix win32