diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-01-31 15:05:09 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-01-31 15:05:09 +0400 |
| commit | dbf54dacf7e3fabe6ccb0e36a1743c91ac445b28 (patch) | |
| tree | 6bdfa69792ad78750fe5bee51a63e1fd70e3d2ff /CMakeLists.txt | |
| parent | 73f301c3a8a28dd25ea850a54d968fc6c4f2b83e (diff) | |
Add Xinerama support for GHOST_GetMainDisplayDimensions() so X11 works as it should (previously would include all monitors).
Now the active monitor size is used on startup.
Currently the cursor position is checked for intersection with the monitor bounds to find the active screen.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e400380390f..fbacb37b24e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -166,6 +166,7 @@ unset(PLATFORM_DEFAULT) if(UNIX AND NOT APPLE) option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support and unicode input)" ON) + option(WITH_X11_XINERAMA "Enable multi-monitor support" ON) option(WITH_X11_XF86VMODE "Enable X11 video mode switching" ON) option(WITH_SYSTEM_GLEW "Use GLEW OpenGL wrapper library provided by the operating system" ON) @@ -414,6 +415,7 @@ if(WITH_GHOST_SDL OR WITH_HEADLESS) set(WITH_GHOST_XDND OFF) set(WITH_X11_XF86VMODE OFF) set(WITH_X11_XINPUT OFF) + set(WITH_X11_XINERAMA OFF) endif() if(MINGW) @@ -800,6 +802,10 @@ if(UNIX AND NOT APPLE) set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} ${X11_Xinput_LIB}") endif() + if(WITH_X11_XINERAMA) + set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} ${X11_Xinerama_LIB}") + endif() + if(WITH_X11_XF86VMODE) # XXX, why dont cmake make this available? FIND_LIBRARY(X11_Xxf86vmode_LIB Xxf86vm ${X11_LIB_SEARCH_PATH}) |