add build options to makefile to generate libcalccmd x86 and x86_64
Merge branch 'dardevelin/libcalccmd' of http://github.com/dardevelin/calccmd into dardevelin/libcalccmd

Conflicts:
	Makefile