Merge branch 'controllerbindings' into 'master'

Update SDL controller mappings, bump SDL version requirement to 2.0.10 See merge request OpenMW/openmw!4397
3 months ago · c31460a969
parent 4a7fcc1437 c5b54cf585
commit c31460a969
2 changed files with 1860 additions and 400 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -466,7 +466,7 @@ find_package(Boost 1.70.0 CONFIG REQUIRED COMPONENTS ${BOOST_COMPONENTS} OPTIONA
 if(OPENMW_USE_SYSTEM_MYGUI)
    find_package(MyGUI 3.4.3 REQUIRED)
 endif()
-find_package(SDL2 2.0.9 REQUIRED)
+find_package(SDL2 2.0.10 REQUIRED)
 find_package(OpenAL REQUIRED)
 find_package(ZLIB REQUIRED)

--- a/files/gamecontrollerdb.txt
+++ b/files/gamecontrollerdb.txt