Improved static build for win32