makefile and codeblocks changes
merge