From 1c40e46cd1c2ccae264a119af06274e3a02a0ce8 Mon Sep 17 00:00:00 2001
From: Doug Johnson <dougvj@gmail.com>
Date: Sun, 9 Jul 2017 16:00:00 -0600
Subject: [PATCH] Add Add XCB/Xlib interaction and X11 specific GTK
 headers/includes

---
 premake5.lua                    | 8 ++++----
 src/xenia/base/platform_linux.h | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/premake5.lua b/premake5.lua
index a5ac7f678..c3c3a9ac8 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -87,11 +87,15 @@ filter("platforms:Linux")
   toolset("clang")
   buildoptions({
     -- "-mlzcnt",  -- (don't) Assume lzcnt is supported.
+    "`pkg-config --cflags gtk+-x11-3.0`"
   })
   links({
     "pthread",
+    "dl",
     "lz4",
     "X11",
+    "xcb",
+    "X11-xcb",
     "GL",
     "GLEW",
     "vulkan",
@@ -113,11 +117,7 @@ filter({"platforms:Linux", "language:C++", "toolset:gcc"})
 filter({"platforms:Linux", "language:C++", "toolset:clang"})
   buildoptions({
     "-std=c++14",
-<<<<<<< HEAD
     "-stdlib=libc++",
-=======
---    "-stdlib=libc++", -- Seems to happier using gcc's libc++
->>>>>>> d50e6f18... Add Linux build params for gtk, libvulkan, etc
   })
   links({
   })
diff --git a/src/xenia/base/platform_linux.h b/src/xenia/base/platform_linux.h
index f77eb1235..2f995e918 100644
--- a/src/xenia/base/platform_linux.h
+++ b/src/xenia/base/platform_linux.h
@@ -19,13 +19,14 @@
 // Xlib/Xcb is used only for GLX/Vulkan interaction, the window management
 // and input events are done with gtk/gdk
 #include <X11/Xlib.h>
+#include <X11/Xlib-xcb.h>
 #include <X11/Xutil.h>
 #include <X11/Xos.h>
 #include <xcb/xcb.h>
 
 //Used for window management. Gtk is for GUI and wigets, gdk is for lower
-//level events like key presses, mouse events, etc
+//level events like key presses, mouse events, window handles, etc
 #include <gtk/gtk.h>
-#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
 
 #endif  // XENIA_BASE_PLATFORM_X11_H_