fixed so it would build under either prior to 1.0 or 1.0 and later, added define for icon/iconset