Add O3 and architecture types to makefile