xenia-project/xenia
1
0
Fork 0
mirror of https://github.com/xenia-project/xenia.git synced 2024-11-23 11:39:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add Add XCB/Xlib interaction and X11 specific GTK headers/includes

Browse Source
This commit is contained in:
Doug Johnson 2017-07-09 16:00:00 -06:00
parent 7ede34b593
commit 1c40e46cd1
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
premake5.lua
View File

@ -87,11 +87,15 @@ filter("platforms:Linux")
toolset("clang") toolset("clang")
buildoptions({ buildoptions({
-- "-mlzcnt", -- (don't) Assume lzcnt is supported. -- "-mlzcnt", -- (don't) Assume lzcnt is supported.
"`pkg-config --cflags gtk+-x11-3.0`"
}) })
links({ links({
"pthread", "pthread",
"dl",
"lz4", "lz4",
"X11", "X11",
"xcb",
"X11-xcb",
"GL", "GL",
"GLEW", "GLEW",
"vulkan", "vulkan",
@ -113,11 +117,7 @@ filter({"platforms:Linux", "language:C++", "toolset:gcc"})
filter({"platforms:Linux", "language:C++", "toolset:clang"}) filter({"platforms:Linux", "language:C++", "toolset:clang"})
buildoptions({ buildoptions({
"-std=c++14", "-std=c++14",
<<<<<<< HEAD
"-stdlib=libc++", "-stdlib=libc++",
=======
-- "-stdlib=libc++", -- Seems to happier using gcc's libc++
>>>>>>> d50e6f18... Add Linux build params for gtk, libvulkan, etc
}) })
links({ links({
}) })

5
src/xenia/base/platform_linux.h
View File

@ -19,13 +19,14 @@
// Xlib/Xcb is used only for GLX/Vulkan interaction, the window management // Xlib/Xcb is used only for GLX/Vulkan interaction, the window management
// and input events are done with gtk/gdk // and input events are done with gtk/gdk
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xlib-xcb.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include <X11/Xos.h> #include <X11/Xos.h>
#include <xcb/xcb.h> #include <xcb/xcb.h>
//Used for window management. Gtk is for GUI and wigets, gdk is for lower //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 <gtk/gtk.h>
#include <gdk/gdk.h> #include <gdk/gdkx.h>
#endif // XENIA_BASE_PLATFORM_X11_H_ #endif // XENIA_BASE_PLATFORM_X11_H_