constexpr not supported by vs2013.
Updated project file with new/old file changes.
Merge pull request #3091 from fluffyfreak/fix_vs2013

Fix vs2013 compilation again