Date: Wed, 3 Mar 2004 12:44:21 +0200
From: "Mike Gorchak" Subject: Misc fixes again I've added custom WM info for the QNX (same as generic for now), which allows to compile all applications, which included SDL_syswm.h directly, otherwise DISABLE_X11 appearing to be not defined and X11 info was used instead, which is wrong. --HG-- extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40871
This commit is contained in:
parent
2209d19e4d
commit
7023285617
1 changed files with 18 additions and 1 deletions
|
@ -50,7 +50,8 @@ typedef struct SDL_SysWMinfo SDL_SysWMinfo;
|
||||||
|
|
||||||
/* This is the structure for custom window manager events */
|
/* This is the structure for custom window manager events */
|
||||||
#if (defined(unix) || defined(__unix__) || defined(_AIX) || defined(__OpenBSD__)) && \
|
#if (defined(unix) || defined(__unix__) || defined(_AIX) || defined(__OpenBSD__)) && \
|
||||||
(!defined(DISABLE_X11) && !defined(__CYGWIN32__) && !defined(ENABLE_NANOX))
|
(!defined(DISABLE_X11) && !defined(__CYGWIN32__) && !defined(ENABLE_NANOX) && \
|
||||||
|
!defined(__QNXNTO__))
|
||||||
/* AIX is unix, of course, but the native compiler CSet doesn't define unix */
|
/* AIX is unix, of course, but the native compiler CSet doesn't define unix */
|
||||||
#include <X11/Xlib.h>
|
#include <X11/Xlib.h>
|
||||||
#include <X11/Xatom.h>
|
#include <X11/Xatom.h>
|
||||||
|
@ -147,6 +148,22 @@ typedef struct {
|
||||||
int window; /* The RISCOS display window */
|
int window; /* The RISCOS display window */
|
||||||
} SDL_SysWMinfo;
|
} SDL_SysWMinfo;
|
||||||
|
|
||||||
|
#elif defined(__QNXNTO__)
|
||||||
|
#include <sys/neutrino.h>
|
||||||
|
#include <Ph.h>
|
||||||
|
|
||||||
|
/* The QNX custom event structure */
|
||||||
|
struct SDL_SysWMmsg {
|
||||||
|
SDL_version version;
|
||||||
|
int data;
|
||||||
|
};
|
||||||
|
|
||||||
|
/* The QNX custom window manager information structure */
|
||||||
|
typedef struct {
|
||||||
|
SDL_version version;
|
||||||
|
int data;
|
||||||
|
} SDL_SysWMinfo;
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
/* The generic custom event structure */
|
/* The generic custom event structure */
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue