From 21d4f7f46a85ff2a538588225c34132f7a994b84 Mon Sep 17 00:00:00 2001
From: Joshua Brookover <josh@jalb.me>
Date: Fri, 11 Aug 2017 20:40:09 -0500
Subject: [PATCH] Updated to latest bgfx

---
 bgfx                         |  2 +-
 bimg                         |  2 +-
 bx                           |  2 +-
 cmake/3rdparty/glslang.cmake | 45 ++++++++++++++++++++++++++++++++++++
 cmake/examples.cmake         |  3 +--
 readme.md                    |  3 ++-
 6 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/bgfx b/bgfx
index df4f4cb..5a987b3 160000
--- a/bgfx
+++ b/bgfx
@@ -1 +1 @@
-Subproject commit df4f4cb3b05cf56bc6970a7820646b242526ba14
+Subproject commit 5a987b3af82d00acbc8aff27d4def2e25b8c0f49
diff --git a/bimg b/bimg
index 8f89c16..3cc5567 160000
--- a/bimg
+++ b/bimg
@@ -1 +1 @@
-Subproject commit 8f89c161d99baa973dcb4cdd46dd135a3febb016
+Subproject commit 3cc556778ba796bab95de27a9d82a0cc63415ccb
diff --git a/bx b/bx
index 335cec7..aeceb79 160000
--- a/bx
+++ b/bx
@@ -1 +1 @@
-Subproject commit 335cec71219919218a7c14f748750ef40df38232
+Subproject commit aeceb79f25a2587bd99e753c33ab03c5111cad82
diff --git a/cmake/3rdparty/glslang.cmake b/cmake/3rdparty/glslang.cmake
index 331b537..e216d39 100644
--- a/cmake/3rdparty/glslang.cmake
+++ b/cmake/3rdparty/glslang.cmake
@@ -30,3 +30,48 @@ endif()
 add_library( glslang STATIC EXCLUDE_FROM_ALL ${GLSLANG_SOURCES} )
 target_include_directories( glslang PUBLIC ${BGFX_DIR}/3rdparty/glslang ${BGFX_DIR}/3rdparty/glslang/glslang/Include ${BGFX_DIR}/3rdparty/glslang/glslang/Public )
 set_target_properties( glslang PROPERTIES FOLDER "bgfx/3rdparty" )
+
+if( MSVC )
+	target_compile_options( glslang PRIVATE
+		"/wd4005"
+		"/wd4100"
+		"/wd4127"
+		"/wd4244"
+		"/wd4456"
+		"/wd4457"
+		"/wd4458"
+		"/wd4702"
+	)
+else()
+	target_compile_options( glslang PRIVATE
+		"-Wno-deprecated-register"
+		"-Wno-ignored-qualifiers"
+		"-Wno-inconsistent-missing-override"
+		"-Wno-missing-field-initializers"
+		"-Wno-reorder"
+		"-Wno-return-type"
+		"-Wno-shadow"
+		"-Wno-sign-compare"
+		"-Wno-undef"
+		"-Wno-unknown-pragmas"
+		"-Wno-unused-parameter"
+		"-Wno-unused-variable"
+	)
+endif()
+
+if( APPLE )
+	target_compile_options( glslang PRIVATE
+		"-Wno-c++11-extensions"
+		"-Wno-unused-const-variable"
+	)
+endif()
+
+if( UNIX AND NOT APPLE )
+	target_compile_options( glslang PRIVATE
+		"-Wno-unused-but-set-variable"
+	)
+endif()
+
+target_compile_definitions( glslang PRIVATE
+	"ENABLE_HLSL=1"
+)
diff --git a/cmake/examples.cmake b/cmake/examples.cmake
index 8e2ed38..032778e 100755
--- a/cmake/examples.cmake
+++ b/cmake/examples.cmake
@@ -103,7 +103,6 @@ function( add_example ARG_NAME )
 	# Add target
 	if( ARG_COMMON )
 		add_library( example-${ARG_NAME} STATIC EXCLUDE_FROM_ALL ${SOURCES} )
-		target_compile_definitions( example-${ARG_NAME} PRIVATE "-D_CRT_SECURE_NO_WARNINGS" "-D__STDC_FORMAT_MACROS" )
 		target_include_directories( example-${ARG_NAME} PUBLIC ${BGFX_DIR}/examples/common )
 		target_link_libraries( example-${ARG_NAME} PUBLIC bgfx ib-compress ocornut-imgui )
 		if( UNIX AND NOT APPLE )
@@ -115,7 +114,6 @@ function( add_example ARG_NAME )
 		else()
 			add_executable( example-${ARG_NAME} WIN32 EXCLUDE_FROM_ALL ${SOURCES} )
 		endif()
-		target_compile_definitions( example-${ARG_NAME} PRIVATE "-D_CRT_SECURE_NO_WARNINGS" "-D__STDC_FORMAT_MACROS" )
 		target_link_libraries( example-${ARG_NAME} example-common )
 		configure_debugging( example-${ARG_NAME} WORKING_DIR ${BGFX_DIR}/examples/runtime )
 		if( MSVC )
@@ -125,6 +123,7 @@ function( add_example ARG_NAME )
 			add_dependencies( examples example-${ARG_NAME} )
 		endif()
 	endif()
+	target_compile_definitions( example-${ARG_NAME} PRIVATE "-D_CRT_SECURE_NO_WARNINGS" "-D__STDC_FORMAT_MACROS" "-DENTRY_CONFIG_IMPLEMENT_MAIN=1" )
 
 	# Configure shaders
 	if( NOT ARG_COMMON )
diff --git a/readme.md b/readme.md
index cae9b99..1ada628 100644
--- a/readme.md
+++ b/readme.md
@@ -39,5 +39,6 @@ Todo
 * Support Android.
 * Support Native Client.
 * Support Windows Phone.
-* More configuration.
+* More configuration. [#12](https://github.com/JoshuaBrookover/bgfx.cmake/issues/12)
 * Add varying.def.sc files as shader dependencies.
+* Combined examples.