Switched to a makefile build