AnarchistGamers/openmw
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-08-03 07:16:31 -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)
find_package(MyGUI 3.4.3 REQUIRED)
endif()
find_package(SDL2 2.0.10 REQUIRED)
find_package(SDL2 2.0.20 REQUIRED)
find_package(OpenAL REQUIRED)
find_package(ZLIB REQUIRED)

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

@ -349,7 +349,6 @@ namespace MWInput
void ControllerManager::enableGyroSensor()
{
mGyroAvailable = false;
#if SDL_VERSION_ATLEAST(2, 0, 14)
SDL_GameController* cntrl = mBindingsManager->getControllerOrNull();
if (!cntrl)
return;
@ -361,7 +360,6 @@ namespace MWInput
return;
}
mGyroAvailable = true;
#endif
}
bool ControllerManager::isGyroAvailable() const
@ -372,7 +370,6 @@ namespace MWInput
std::array<float, 3> ControllerManager::getGyroValues() const
{
float gyro[3] = { 0.f };
#if SDL_VERSION_ATLEAST(2, 0, 14)
SDL_GameController* cntrl = mBindingsManager->getControllerOrNull();
if (cntrl && mGyroAvailable)
{
@ -380,7 +377,6 @@ namespace MWInput
if (result < 0)
Log(Debug::Error) << "Failed to get game controller sensor data: " << SDL_GetError();
}
#endif
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 mPressure;
#if SDL_VERSION_ATLEAST(2, 0, 14)
explicit TouchEvent(const SDL_ControllerTouchpadEvent& arg)
: mDevice(arg.touchpad)
, mFinger(arg.finger)
@ -37,7 +36,6 @@ namespace SDLUtil
, mPressure(arg.pressure)
{
}
#endif
};
///////////////

2
components/sdlutil/sdlinputwrapper.cpp
View File

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