AnarchistGamers/openmw
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-08-03 15:27:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bump libsdl to 2.0.20

Browse Source
This commit is contained in:
Andy Lanzone 2025-07-17 07:20:13 -07:00 committed by psi29a
parent 3b7b97c58c
commit f45053ad25
4 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -466,7 +466,7 @@ find_package(Boost 1.70.0 CONFIG REQUIRED COMPONENTS ${BOOST_COMPONENTS} OPTIONA
if(OPENMW_USE_SYSTEM_MYGUI) if(OPENMW_USE_SYSTEM_MYGUI)
find_package(MyGUI 3.4.3 REQUIRED) find_package(MyGUI 3.4.3 REQUIRED)
endif() endif()
find_package(SDL2 2.0.10 REQUIRED) find_package(SDL2 2.0.20 REQUIRED)
find_package(OpenAL REQUIRED) find_package(OpenAL REQUIRED)
find_package(ZLIB REQUIRED) find_package(ZLIB REQUIRED)

4
apps/openmw/mwinput/controllermanager.cpp
View File

@ -349,7 +349,6 @@ namespace MWInput
void ControllerManager::enableGyroSensor() void ControllerManager::enableGyroSensor()
{ {
mGyroAvailable = false; mGyroAvailable = false;
#if SDL_VERSION_ATLEAST(2, 0, 14)
SDL_GameController* cntrl = mBindingsManager->getControllerOrNull(); SDL_GameController* cntrl = mBindingsManager->getControllerOrNull();
if (!cntrl) if (!cntrl)
return; return;
@ -361,7 +360,6 @@ namespace MWInput
return; return;
} }
mGyroAvailable = true; mGyroAvailable = true;
#endif
} }
bool ControllerManager::isGyroAvailable() const bool ControllerManager::isGyroAvailable() const
@ -372,7 +370,6 @@ namespace MWInput
std::array<float, 3> ControllerManager::getGyroValues() const std::array<float, 3> ControllerManager::getGyroValues() const
{ {
float gyro[3] = { 0.f }; float gyro[3] = { 0.f };
#if SDL_VERSION_ATLEAST(2, 0, 14)
SDL_GameController* cntrl = mBindingsManager->getControllerOrNull(); SDL_GameController* cntrl = mBindingsManager->getControllerOrNull();
if (cntrl && mGyroAvailable) if (cntrl && mGyroAvailable)
{ {
@ -380,7 +377,6 @@ namespace MWInput
if (result < 0) if (result < 0)
Log(Debug::Error) << "Failed to get game controller sensor data: " << SDL_GetError(); Log(Debug::Error) << "Failed to get game controller sensor data: " << SDL_GetError();
} }
#endif
return std::array<float, 3>({ gyro[0], gyro[1], gyro[2] }); return std::array<float, 3>({ gyro[0], gyro[1], gyro[2] });
} }

2
components/sdlutil/events.hpp
View File

@ -28,7 +28,6 @@ namespace SDLUtil
float mY; float mY;
float mPressure; float mPressure;
#if SDL_VERSION_ATLEAST(2, 0, 14)
explicit TouchEvent(const SDL_ControllerTouchpadEvent& arg) explicit TouchEvent(const SDL_ControllerTouchpadEvent& arg)
: mDevice(arg.touchpad) : mDevice(arg.touchpad)
, mFinger(arg.finger) , mFinger(arg.finger)
@ -37,7 +36,6 @@ namespace SDLUtil
, mPressure(arg.pressure) , mPressure(arg.pressure)
{ {
} }
#endif
}; };
/////////////// ///////////////

2
components/sdlutil/sdlinputwrapper.cpp
View File

@ -173,7 +173,6 @@ namespace SDLUtil
if (mConListener) if (mConListener)
mConListener->axisMoved(1, evt.caxis); mConListener->axisMoved(1, evt.caxis);
break; break;
#if SDL_VERSION_ATLEAST(2, 0, 14)
case SDL_CONTROLLERSENSORUPDATE: case SDL_CONTROLLERSENSORUPDATE:
// controller sensor data is received on demand // controller sensor data is received on demand
break; break;
@ -186,7 +185,6 @@ namespace SDLUtil
case SDL_CONTROLLERTOUCHPADUP: case SDL_CONTROLLERTOUCHPADUP:
mConListener->touchpadReleased(1, TouchEvent(evt.ctouchpad)); mConListener->touchpadReleased(1, TouchEvent(evt.ctouchpad));
break; break;
#endif
case SDL_WINDOWEVENT: case SDL_WINDOWEVENT:
handleWindowEvent(evt); handleWindowEvent(evt);
break; break;