Made better gcc vs llvm makefiles stuff

Now it compiles on Linux with g++ version 4.8.2