From 377ea644f1504ce14b15da91f7f7df10d86fe26b Mon Sep 17 00:00:00 2001
From: Joshua Brookover <josh@jalb.me>
Date: Tue, 21 Feb 2017 21:40:38 -0600
Subject: [PATCH] Improved Linux support

---
 cmake/bgfx.cmake          | 10 +++++++++-
 cmake/bx.cmake            |  6 ++++++
 cmake/examples.cmake      |  5 +++++
 cmake/tools/shaderc.cmake |  3 ---
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/cmake/bgfx.cmake b/cmake/bgfx.cmake
index 5ba154e..3635bde 100755
--- a/cmake/bgfx.cmake
+++ b/cmake/bgfx.cmake
@@ -51,11 +51,14 @@ if( APPLE )
 	target_link_libraries( bgfx PUBLIC ${COCOA_LIBRARY} ${METAL_LIBRARY} ${QUARTZCORE_LIBRARY} )
 endif()
 
+if( UNIX )
+	target_link_libraries( bgfx PUBLIC GL )
+endif()
+
 # Excluded files from compilation
 set_source_files_properties( ${BGFX_DIR}/src/amalgamated.cpp PROPERTIES HEADER_FILE_ONLY ON )
 set_source_files_properties( ${BGFX_DIR}/src/amalgamated.mm PROPERTIES HEADER_FILE_ONLY ON )
 set_source_files_properties( ${BGFX_DIR}/src/glcontext_ppapi.cpp PROPERTIES HEADER_FILE_ONLY ON )
-set_source_files_properties( ${BGFX_DIR}/src/glcontext_glx.cpp PROPERTIES HEADER_FILE_ONLY ON )
 set_source_files_properties( ${BGFX_DIR}/src/glcontext_egl.cpp PROPERTIES HEADER_FILE_ONLY ON )
 
 # Exclude mm files if not on OS X
@@ -65,6 +68,11 @@ if( NOT APPLE )
 	set_source_files_properties( ${BGFX_DIR}/src/renderer_mtl.mm PROPERTIES HEADER_FILE_ONLY ON )
 endif()
 
+# Exclude glx context on non-unix
+if( NOT UNIX )
+	set_source_files_properties( ${BGFX_DIR}/src/glcontext_glx.cpp PROPERTIES HEADER_FILE_ONLY ON )
+endif()
+
 # Put in a "bgfx" folder in Visual Studio
 set_target_properties( bgfx PROPERTIES FOLDER "bgfx" )
 
diff --git a/cmake/bx.cmake b/cmake/bx.cmake
index c308de1..d2eb42d 100644
--- a/cmake/bx.cmake
+++ b/cmake/bx.cmake
@@ -38,5 +38,11 @@ elseif( APPLE )
 	target_include_directories( bx PUBLIC ${BX_DIR}/include/compat/osx )
 endif()
 
+# Threads
+if( UNIX )
+	find_package( Threads )
+	target_link_libraries( bx ${CMAKE_THREAD_LIBS_INIT} dl )
+endif()
+
 # Put in a "bgfx" folder in Visual Studio
 set_target_properties( bx PROPERTIES FOLDER "bgfx" )
diff --git a/cmake/examples.cmake b/cmake/examples.cmake
index 32ea80d..3ff72c7 100755
--- a/cmake/examples.cmake
+++ b/cmake/examples.cmake
@@ -66,6 +66,8 @@ function( add_bgfx_shader FILE FOLDER )
 		foreach( OUT ${OUTPUTS} )
 			list( APPEND OUTPUT_FILES ${${OUT}_OUTPUT} )
 			list( APPEND COMMANDS COMMAND "$<TARGET_FILE:shaderc>" ${${OUT}} )
+			get_filename_component( OUT_DIR ${${OUT}_OUTPUT} DIRECTORY )
+			file( MAKE_DIRECTORY ${OUT_DIR} )
 		endforeach()
 		file( RELATIVE_PATH PRINT_NAME ${BGFX_DIR}/examples ${FILE} )
 		add_custom_command(
@@ -104,6 +106,9 @@ function( add_example ARG_NAME )
 		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 )
+			target_link_libraries( example-${ARG_NAME} PUBLIC X11 )
+		endif()
 	else()
 		add_executable( example-${ARG_NAME} WIN32 EXCLUDE_FROM_ALL ${SOURCES} )
 		target_compile_definitions( example-${ARG_NAME} PRIVATE "-D_CRT_SECURE_NO_WARNINGS" "-D__STDC_FORMAT_MACROS" )
diff --git a/cmake/tools/shaderc.cmake b/cmake/tools/shaderc.cmake
index 40b5e28..1c9c313 100644
--- a/cmake/tools/shaderc.cmake
+++ b/cmake/tools/shaderc.cmake
@@ -14,13 +14,10 @@ include( cmake/3rdparty/fcpp.cmake )
 include( cmake/3rdparty/glsl-optimizer.cmake )
 include( cmake/3rdparty/glslang.cmake )
 
-find_package(Threads)
-
 add_executable( shaderc ${BGFX_DIR}/tools/shaderc/shaderc.cpp ${BGFX_DIR}/tools/shaderc/shaderc.h ${BGFX_DIR}/tools/shaderc/shaderc_glsl.cpp ${BGFX_DIR}/tools/shaderc/shaderc_hlsl.cpp ${BGFX_DIR}/tools/shaderc/shaderc_pssl.cpp ${BGFX_DIR}/tools/shaderc/shaderc_spirv.cpp )
 target_compile_definitions( shaderc PRIVATE "-D_CRT_SECURE_NO_WARNINGS" )
 set_target_properties( shaderc PROPERTIES FOLDER "bgfx/tools" )
 target_link_libraries( shaderc bx bgfx-vertexdecl bgfx-shader-spirv fcpp glsl-optimizer glslang )
-target_link_libraries( shaderc ${CMAKE_THREAD_LIBS_INIT})
 add_dependencies( tools shaderc )
 
 function( add_shader ARG_FILE )