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

Fix linux build from 12832

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12834 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
curaga 2013-06-01 10:31:27 +00:00
parent 3e1843b129
commit 769e093ae2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/graphics/irr_driver.cpp
View File

@ -202,7 +202,7 @@ void IrrDriver::updateConfigIfRelevant()
} }
#elif defined(__linux__) && !defined(ANDROID) #elif defined(__linux__) && !defined(ANDROID)
using namespace X11; using namespace X11;
const SExposedVideoData& videoData = const video::SExposedVideoData& videoData =
m_device->getVideoDriver()->getExposedVideoData(); m_device->getVideoDriver()->getExposedVideoData();
Display* display = (Display*)videoData.OpenGLLinux.X11Display; Display* display = (Display*)videoData.OpenGLLinux.X11Display;
XWindowAttributes xwa; XWindowAttributes xwa;
@ -388,7 +388,7 @@ void IrrDriver::initDevice()
#if defined(__linux__) && !defined(ANDROID) #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 video::SExposedVideoData& videoData = m_video_driver
->getExposedVideoData(); ->getExposedVideoData();
XClassHint* classhint = XAllocClassHint(); XClassHint* classhint = XAllocClassHint();
classhint->res_name = (char*)"SuperTuxKart"; classhint->res_name = (char*)"SuperTuxKart";
@ -508,7 +508,7 @@ bool IrrDriver::moveWindow(const int x, const int y)
} }
#elif defined(__linux__) && !defined(ANDROID) #elif defined(__linux__) && !defined(ANDROID)
using namespace X11; using namespace X11;
const SExposedVideoData& videoData = m_video_driver->getExposedVideoData(); const video::SExposedVideoData& videoData = m_video_driver->getExposedVideoData();
// TODO: Actually handle possible failure // TODO: Actually handle possible failure
XMoveWindow((Display*)videoData.OpenGLLinux.X11Display, XMoveWindow((Display*)videoData.OpenGLLinux.X11Display,
videoData.OpenGLLinux.X11Window, videoData.OpenGLLinux.X11Window,