diff options
| author | cutealien <cutealien@dfc29bdd-3216-0410-991c-e03cc46cb475> | 2020-12-30 18:39:20 +0000 |
|---|---|---|
| committer | cutealien <cutealien@dfc29bdd-3216-0410-991c-e03cc46cb475> | 2020-12-30 18:39:20 +0000 |
| commit | a9f7c2abc9c3d8e586a541303f830d492b8b70e5 (patch) | |
| tree | 50f81bf0e67d4aa636aa8fadd6b0f8c4a2aabc3a /include/IrrCompileConfig.h | |
| parent | 1e6fe54cf528de179390e81dbd97c0884b30bdbf (diff) | |
| download | irrlicht-a9f7c2abc9c3d8e586a541303f830d492b8b70e5.tar.xz | |
Merging r6173 through r6179 from trunk to ogl-es branch
- Adding optional support for touch input in X11
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6180 dfc29bdd-3216-0410-991c-e03cc46cb475
Diffstat (limited to 'include/IrrCompileConfig.h')
| -rw-r--r-- | include/IrrCompileConfig.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/include/IrrCompileConfig.h b/include/IrrCompileConfig.h index 341b09a..ce7e4bb 100644 --- a/include/IrrCompileConfig.h +++ b/include/IrrCompileConfig.h @@ -317,18 +317,22 @@ define out. */ #undef _IRR_COMPILE_WITH_X11_
#endif
-//! On some Linux systems the XF86 vidmode extension or X11 RandR are missing. Use these flags
-//! to remove the dependencies such that Irrlicht will compile on those systems, too.
-//! If you don't need colored cursors you can also disable the Xcursor extension
+//! On some Linux systems the XF86 vidmode extension, X11 RandR, or XInput2 are missing.
+//! Use these defines to add/remove support for those dependencies as needed.
+//! XInput2 (library called Xi) is currently only used to support touch-input.
#if defined(_IRR_LINUX_PLATFORM_) && defined(_IRR_COMPILE_WITH_X11_)
#define _IRR_LINUX_X11_VIDMODE_
//#define _IRR_LINUX_X11_RANDR_
+//#define _IRR_LINUX_X11_XINPUT2_
#ifdef NO_IRR_LINUX_X11_VIDMODE_
#undef _IRR_LINUX_X11_VIDMODE_
#endif
#ifdef NO_IRR_LINUX_X11_RANDR_
#undef _IRR_LINUX_X11_RANDR_
#endif
+#ifdef NO_IRR_LINUX_X11_XINPUT2_
+#undef _IRR_LINUX_X11_XINPUT2_
+#endif
//! X11 has by default only monochrome cursors, but using the Xcursor library we can also get color cursor support.
//! If you have the need for custom color cursors on X11 then enable this and make sure you also link
|