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

Remove USE_XRANDR flag from cmake.

Browse Source 
Our vidmode code is old, has some bugs (eg. resolution is not restored properly in some cases), doesn't have multi monitor support and IMO shouldn't be used in current state.

If someone really wants to use it, the flags can be set directly in IrrCompileConfig.h.
This commit is contained in:
Deve 2016-08-12 23:39:12 +02:00
parent d320df749f
commit 08202f2fa8
2 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
CMakeLists.txt
View File

@ -41,7 +41,6 @@ else()
endif() endif()
if(UNIX AND NOT APPLE) if(UNIX AND NOT APPLE)
option(USE_XRANDR "Use xrandr instead of vidmode" ON)
option(USE_ASAN "Build with Leak/Address sanitizer" OFF) option(USE_ASAN "Build with Leak/Address sanitizer" OFF)
option(USE_LIBBFD "Use libbfd for crash reporting and leak check" OFF) option(USE_LIBBFD "Use libbfd for crash reporting and leak check" OFF)
endif() endif()
@ -215,14 +214,9 @@ if(UNIX AND NOT APPLE)
find_package(X11 REQUIRED) find_package(X11 REQUIRED)
include_directories(${X11_INCLUDE_DIR}) include_directories(${X11_INCLUDE_DIR})
if(USE_XRANDR) find_package(Xrandr REQUIRED)
find_package(Xrandr REQUIRED) if(NOT XRANDR_FOUND)
if(NOT XRANDR_FOUND) message(FATAL_ERROR "XRANDR not found.")
message(FATAL_ERROR "XRANDR not found.")
endif()
else()
find_library(IRRLICHT_XF86VM_LIBRARY Xxf86vm)
mark_as_advanced(IRRLICHT_XF86VM_LIBRARY)
endif() endif()
if(USE_LIBBFD) if(USE_LIBBFD)
@ -382,12 +376,7 @@ else()
endif() endif()
if(UNIX AND NOT APPLE) if(UNIX AND NOT APPLE)
target_link_libraries(supertuxkart ${X11_LIBRARIES}) target_link_libraries(supertuxkart ${X11_LIBRARIES} ${XRANDR_LIBRARIES})
if(USE_XRANDR)
target_link_libraries(supertuxkart ${XRANDR_LIBRARIES})
else()
target_link_libraries(supertuxkart ${IRRLICHT_XF86VM_LIBRARY})
endif()
if(USE_LIBBFD) if(USE_LIBBFD)
target_link_libraries(supertuxkart ${LIBBFD_LIBRARIES}) target_link_libraries(supertuxkart ${LIBBFD_LIBRARIES})
endif() endif()

2
lib/irrlicht/CMakeLists.txt
View File

@ -47,7 +47,7 @@ if(USE_GLES2)
endif() endif()
# Xrandr # Xrandr
if(UNIX AND USE_XRANDR) if(UNIX AND NOT APPLE)
add_definitions(-DNO_IRR_LINUX_X11_VIDMODE_) add_definitions(-DNO_IRR_LINUX_X11_VIDMODE_)
add_definitions(-D_IRR_LINUX_X11_RANDR_) add_definitions(-D_IRR_LINUX_X11_RANDR_)
endif() endif()