Minor change to how some of the options work. Add preprocessor directives so that the same source code can be used for Multicore CPU and OpenCL platforms.