Fix unsigned/signed mismatch
Add NaCl build and proper Makefile
Change return to full solution
Merge makefiles