Revised macro make, and added back the auto-linking for MSVC