Fix merge conflicts
Update cmake file and fix a bug in il_error.cpp
Fix weird code detected by gcc
Linux port
Linux fixes