Joined the traditional and simplified options for the win32 package.