valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Make it possible to compile with Xlib headers. Pray nobody does that who has evdev installed

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@3384
This commit is contained in:
Peter Veenstra 2009-05-14 18:01:25 +00:00
parent fb2a129ca6
commit 1ecf32e267
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/gui/sdl_mapper.cpp
View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* $Id: sdl_mapper.cpp,v 1.58 2009-04-25 06:59:54 qbix79 Exp $ */
/* $Id: sdl_mapper.cpp,v 1.59 2009-05-14 18:01:25 qbix79 Exp $ */
#include <vector>
#include <list>
@ -2332,7 +2332,7 @@ void MAPPER_Init(void) {
}
}
//Somehow including them at the top conflicts with something in setup.h
#ifdef LINUX
#ifdef C_X11_XKB
#include "SDL_syswm.h"
#include <X11/XKBlib.h>
#endif
@ -2381,7 +2381,7 @@ void MAPPER_StartUp(Section * sec) {
sdlkey_map[0x41]=SDLK_KP6;
#elif !defined (WIN32) /* => Linux & BSDs */
bool evdev_input = false;
#ifdef LINUX
#ifdef C_X11_XKB
SDL_SysWMinfo info;
SDL_VERSION(&info.version);
if (SDL_GetWMInfo(&info)) {