Merge "Modify SDL makefile to use the same CFLAGS on 64 bit builds"