ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compililation fixes if no X11 is available.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11607 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2012-09-19 04:39:05 +00:00
parent bd9736615a
commit 16fe9bdccd
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/graphics/irr_driver.cpp
View File

@ -58,7 +58,7 @@ using namespace irr::video;
#ifdef WIN32 #ifdef WIN32
#include <Windows.h> #include <Windows.h>
#endif #endif
#if defined(__linux__) #if defined(__linux__) && !defined(ANDROID)
namespace X11 namespace X11
{ {
#include <X11/Xlib.h> #include <X11/Xlib.h>
@ -102,7 +102,7 @@ IrrDriver::~IrrDriver()
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#if defined(__linux__) #if defined(__linux__) && !defined(ANDROID)
/* /*
Returns the parent window of "window" (i.e. the ancestor of window Returns the parent window of "window" (i.e. the ancestor of window
that is a direct child of the root, or window itself if it is a direct child). that is a direct child of the root, or window itself if it is a direct child).
@ -170,7 +170,7 @@ void IrrDriver::updateConfigIfRelevant()
{ {
printf("Could not retrieve window location\n"); printf("Could not retrieve window location\n");
} }
#elif defined(__linux__) #elif defined(__linux__) && !defined(ANDROID)
using namespace X11; using namespace X11;
const SExposedVideoData& videoData = m_device->getVideoDriver()->getExposedVideoData(); const SExposedVideoData& videoData = m_device->getVideoDriver()->getExposedVideoData();
Display* display = (Display*)videoData.OpenGLLinux.X11Display; Display* display = (Display*)videoData.OpenGLLinux.X11Display;
@ -365,7 +365,7 @@ void IrrDriver::initDevice()
// Only change video driver settings if we are showing graphics // Only change video driver settings if we are showing graphics
if (!ProfileWorld::isNoGraphics()) if (!ProfileWorld::isNoGraphics())
{ {
#if defined(__linux__) #if defined(__linux__) && !defined(ANDROID)
// Set class hints on Linux, used by Window Managers. // Set class hints on Linux, used by Window Managers.
using namespace X11; using namespace X11;
const SExposedVideoData& videoData = m_video_driver const SExposedVideoData& videoData = m_video_driver
@ -533,7 +533,7 @@ bool IrrDriver::moveWindow(const int x, const int y)
printf("[IrrDriver] WARNING: Could not set window location\n"); printf("[IrrDriver] WARNING: Could not set window location\n");
return false; return false;
} }
#elif defined(__linux__) #elif defined(__linux__) && !defined(ANDROID)
using namespace X11; using namespace X11;
// TODO: Actually handle possible failure // TODO: Actually handle possible failure