Added consistent compiler definitions, and merge gcc and clang options