From ab05bc6974c47ccdcdd59a08b6ee45f37f768ed2 Mon Sep 17 00:00:00 2001
From: bkaradzic <branimirkaradzic@gmail.com>
Date: Fri, 12 Apr 2013 23:43:46 -0700
Subject: [PATCH] Added BX_PLATFORM_QNX.

---
 makefile             | 7 +++++++
 premake/bgfx.lua     | 4 ++--
 premake/premake4.lua | 2 +-
 src/config.h         | 1 +
 src/renderer_gl.cpp  | 2 ++
 src/renderer_gl.h    | 2 +-
 6 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/makefile b/makefile
index ac166e279..718d0e74b 100755
--- a/makefile
+++ b/makefile
@@ -13,6 +13,7 @@ all:
 	premake4 --file=premake/premake4.lua --gcc=linux gmake
 	premake4 --file=premake/premake4.lua --gcc=emscripten gmake
 	premake4 --file=premake/premake4.lua --gcc=osx gmake
+	premake4 --file=premake/premake4.lua --gcc=qnx-arm gmake
 	premake4 --file=premake/premake4.lua xcode4
 	make -s --no-print-directory -C src
 
@@ -78,6 +79,12 @@ osx-release64:
 	make -C .build/projects/gmake-osx config=release64
 osx: osx-debug32 osx-release32 osx-debug64 osx-release64
 
+qnx-arm-debug32:
+	make -C .build/projects/gmake-osx config=debug32
+qnx-arm-release32:
+	make -C .build/projects/gmake-osx config=release32
+qnx-arm: qnx-arm-debug32 qnx-arm-release32
+
 rebuild-shaders:
 	make -C examples rebuild
 
diff --git a/premake/bgfx.lua b/premake/bgfx.lua
index bab0fb9f6..843156aec 100755
--- a/premake/bgfx.lua
+++ b/premake/bgfx.lua
@@ -25,12 +25,12 @@ project "bgfx"
 			"$(DXSDK_DIR)/include",
 		}
 
-	configuration { "macosx" }
+	configuration { "osx" }
 		files {
 			BGFX_DIR .. "src/**.mm",
 		}
 
-	configuration { "not nacl" }
+	configuration { "(not nacl*) and (not qnx*)" }
 		includedirs {
 			--nacl has GLES2 headers modified...
 			BGFX_DIR .. "3rdparty/glext",
diff --git a/premake/premake4.lua b/premake/premake4.lua
index 6fe81cd0e..19b71e39f 100644
--- a/premake/premake4.lua
+++ b/premake/premake4.lua
@@ -81,7 +81,7 @@ function exampleProject(_name, _uuid)
 			"pthread",
 		}
 
-	configuration { "macosx" }
+	configuration { "osx" }
 		files {
 			BGFX_DIR .. "examples/common/**.mm",
 		}
diff --git a/src/config.h b/src/config.h
index c43ab9085..8539900ae 100644
--- a/src/config.h
+++ b/src/config.h
@@ -39,6 +39,7 @@
 					| BX_PLATFORM_NACL \
 					| BX_PLATFORM_ANDROID \
 					| BX_PLATFORM_IOS \
+					| BX_PLATFORM_QNX \
 					)
 #	endif // BGFX_CONFIG_RENDERER_OPENGLES2
 
diff --git a/src/renderer_gl.cpp b/src/renderer_gl.cpp
index 2ff7e98c8..7a855fe32 100644
--- a/src/renderer_gl.cpp
+++ b/src/renderer_gl.cpp
@@ -162,6 +162,7 @@ namespace bgfx
 		}
 	}
 
+#if BGFX_CONFIG_RENDERER_OPENGL
 	static void APIENTRY debugProcCb(GLenum _source, GLenum _type, GLuint _id, GLenum _severity, GLsizei /*_length*/, const GLchar* _message, GLvoid* /*_userParam*/)
 	{
 		BX_TRACE("src %d, type %d, id %d, severity %d, '%s'"
@@ -172,6 +173,7 @@ namespace bgfx
 				, _message
 				);
 	}
+#endif // BGFX_CONFIG_RENDERER_OPENGL
 
 	struct RendererContext
 	{
diff --git a/src/renderer_gl.h b/src/renderer_gl.h
index 805de02c4..a2fe5be5e 100755
--- a/src/renderer_gl.h
+++ b/src/renderer_gl.h
@@ -86,7 +86,7 @@
 #		include <GLES3/gl3ext.h>
 #	endif // BGFX_CONFIG_RENDERER_
 
-#	if  BX_PLATFORM_EMSCRIPTEN || BX_PLATFORM_WINDOWS
+#	if BX_PLATFORM_EMSCRIPTEN || BX_PLATFORM_WINDOWS || BX_PLATFORM_QNX
 #		undef BGFX_USE_EGL
 #		define BGFX_USE_EGL 1
 #		include "glcontext_egl.h"