Fix vs2013 compilation again

constexpr not supported by vs2013.
Updated project file with new/old file changes.