Fix C++11 compilation errors.

src/LLVM/LLVM.cbp

@@ -90,7 +90,6 @@
 			<Add option="-Wall" />
 			<Add option="-fexceptions" />
 			<Add option="-fno-operator-names" />
-			<Add option="-ffriend-injection" />
 			<Add option="-msse2" />
 			<Add option="-D__STDC_LIMIT_MACROS" />
 			<Add option="-D__STDC_CONSTANT_MACROS" />

src/OpenGL/common/debug.h

@@ -31,21 +31,21 @@ namespace es
 #if defined(ANGLE_DISABLE_TRACE)
 #define TRACE(message, ...) (void(0))
 #else
-#define TRACE(message, ...) es::trace("trace: %s(%d): "message"\n", __FUNCTION__, __LINE__, ##__VA_ARGS__)
+#define TRACE(message, ...) es::trace("trace: %s(%d): " message "\n", __FUNCTION__, __LINE__, ##__VA_ARGS__)
 #endif
 
 // A macro to output a function call and its arguments to the debugging log, to denote an item in need of fixing.
 #if defined(ANGLE_DISABLE_TRACE)
 #define FIXME(message, ...) (void(0))
 #else
-#define FIXME(message, ...) do {es::trace("fixme: %s(%d): "message"\n", __FUNCTION__, __LINE__, ##__VA_ARGS__); assert(false);} while(false)
+#define FIXME(message, ...) do {es::trace("fixme: %s(%d): " message "\n", __FUNCTION__, __LINE__, ##__VA_ARGS__); assert(false);} while(false)
 #endif
 
 // A macro to output a function call and its arguments to the debugging log, in case of error.
 #if defined(ANGLE_DISABLE_TRACE)
 #define ERR(message, ...) (void(0))
 #else
-#define ERR(message, ...) do {es::trace("err: %s(%d): "message"\n", __FUNCTION__, __LINE__, ##__VA_ARGS__); assert(false);} while(false)
+#define ERR(message, ...) do {es::trace("err: %s(%d): " message "\n", __FUNCTION__, __LINE__, ##__VA_ARGS__); assert(false);} while(false)
 #endif
 
 // A macro asserting a condition and outputting failures to the debug log

src/OpenGL/libEGL/libEGL.cpp

@@ -205,7 +205,7 @@ const char *EGLAPIENTRY eglQueryString(EGLDisplay dpy, EGLint name)
         case EGL_VENDOR:
             return success("TransGaming Inc.");
         case EGL_VERSION:
-            return success("1.4 SwiftShader "VERSION_STRING);
+            return success("1.4 SwiftShader " VERSION_STRING);
         }
 
         return error(EGL_BAD_PARAMETER, (const char*)NULL);

src/OpenGL/libGLESv2/libGLESv2.cbp

@@ -106,7 +106,6 @@
 			<Add option="-Wall" />
 			<Add option="-fexceptions" />
 			<Add option="-fno-operator-names" />
-			<Add option="-ffriend-injection" />
 			<Add option="-msse2" />
 			<Add option="-D__STDC_LIMIT_MACROS" />
 			<Add option="-D__STDC_CONSTANT_MACROS" />
@@ -163,9 +162,7 @@
 		<Unit filename="../../Main/Register.hpp" />
 		<Unit filename="../../Main/SwiftConfig.cpp" />
 		<Unit filename="../../Main/SwiftConfig.hpp" />
-		<Unit filename="../../Main/crc.c">
-			<Option compilerVar="CC" />
-		</Unit>
+		<Unit filename="../../Main/crc.cpp" />
 		<Unit filename="../../Main/crc.h" />
 		<Unit filename="../../Main/serialcommon.h" />
 		<Unit filename="../../Main/serialvalid.cpp" />

src/OpenGL/libGLESv2/libGLESv2.cpp

@@ -3406,9 +3406,9 @@ const GLubyte* GL_APIENTRY glGetString(GLenum name)
         case GL_RENDERER:
             return (GLubyte*)"SwiftShader";
         case GL_VERSION:
-            return (GLubyte*)"OpenGL ES 2.0 SwiftShader "VERSION_STRING;
+            return (GLubyte*)"OpenGL ES 2.0 SwiftShader " VERSION_STRING;
         case GL_SHADING_LANGUAGE_VERSION:
-            return (GLubyte*)"OpenGL ES GLSL ES 1.00 SwiftShader "VERSION_STRING;
+            return (GLubyte*)"OpenGL ES GLSL ES 1.00 SwiftShader " VERSION_STRING;
         case GL_EXTENSIONS:
             // Keep list sorted in following order:
 	        // OES extensions