Updated the Windows Makefile for the new libraries