Got library and demos building on mingw32 and ubuntu again