Would it be a good idea to switch to CMake instead? With CMake, you can generate both makefiles and templates for Visual Studio and lots of other compilers / environments.
On top of that, it could make compiling for Android (and perhaps iOS and uPhone as well? dunno..) a lot easier. It does have its share of issues (like not being able to grab all cpp files inside a directory, you’ll have to specify them by name), but from experience I can tell you that the benefits outweights the negative points with ease.