Another attempt at getting the Win32 build working.