Merge pull request #1503 from seanpaultaylor/next

Appends GP_ for USE_ features for NEON and VAO

gameplay/src/MathUtil.h

@@ -73,7 +73,7 @@ private:
 
 #define MATRIX_SIZE ( sizeof(float) * 16)
 
-#ifdef USE_NEON
+#ifdef GP_USE_NEON
 #include "MathUtilNeon.inl"
 #else
 #include "MathUtil.inl"

gameplay/src/VertexAttributeBinding.cpp

@@ -89,7 +89,7 @@ VertexAttributeBinding* VertexAttributeBinding::create(Mesh* mesh, const VertexF
     // Create a new VertexAttributeBinding.
     VertexAttributeBinding* b = new VertexAttributeBinding();
 
-#ifdef USE_VAO
+#ifdef GP_USE_VAO
     if (mesh && glGenVertexArrays)
     {
         GL_ASSERT( glBindBuffer(GL_ARRAY_BUFFER, 0) );