Updated linker/compiler options/ added some code