Feature/fix cross compilation

Updating makefile to take into account cross-compilation.