mirrors/mkxp-z
1
0
Fork 0
mirror of https://github.com/mkxp-z/mkxp-z.git synced 2025-07-01 14:15:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix meson build

Browse source
This commit is contained in:
Struma 2022-07-05 17:57:54 -04:00
parent d4dc31af9e
commit 77fce74b93
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/settingsmenu.cpp
View file

@ -617,7 +617,7 @@ struct SettingsMenuPrivate
case SDL_CONTROLLERBUTTONDOWN: case SDL_CONTROLLERBUTTONDOWN:
desc.type = CButton; desc.type = CButton;
desc.d.cb = event.cbutton.button; desc.d.cb = (SDL_GameControllerButton)event.cbutton.button;
break; break;
case SDL_CONTROLLERAXISMOTION: case SDL_CONTROLLERAXISMOTION:
@ -629,7 +629,7 @@ struct SettingsMenuPrivate
return true; return true;
desc.type = CAxis; desc.type = CAxis;
desc.d.ca.axis = event.caxis.axis; desc.d.ca.axis = (SDL_GameControllerAxis)event.caxis.axis;
desc.d.ca.dir = v < 0 ? Negative : Positive; desc.d.ca.dir = v < 0 ? Negative : Positive;
break; break;
} }
@ -1028,9 +1028,8 @@ bool SettingsMenu::onEvent(const SDL_Event &event)
break; break;
case SDL_JOYBUTTONDOWN : case SDL_JOYBUTTONDOWN :
case SDL_JOYBUTTONUP : case SDL_CONTROLLERBUTTONUP :
case SDL_JOYHATMOTION : case SDL_CONTROLLERAXISMOTION :
case SDL_JOYAXISMOTION :
if (!p->hasFocus) if (!p->hasFocus)
return false; return false;
break; break;
@ -1105,9 +1104,8 @@ bool SettingsMenu::onEvent(const SDL_Event &event)
break; break;
} }
case SDL_JOYBUTTONDOWN: case SDL_CONTROLLERBUTTONDOWN:
case SDL_JOYHATMOTION: case SDL_CONTROLLERAXISMOTION:
case SDL_JOYAXISMOTION:
if (p->state != AwaitingInput) if (p->state != AwaitingInput)
return true; return true;
break; break;

2
windows/Makefile
View file

@ -37,7 +37,7 @@ RUBY_CONFIGURE_ARGS := \
--prefix="$(shell cygpath -m ${BUILD_PREFIX})" \ --prefix="$(shell cygpath -m ${BUILD_PREFIX})" \
--enable-install-static-library \ --enable-install-static-library \
--disable-install-doc \ --disable-install-doc \
--with-out-ext=openssl,readline,dbm,gdbm \ --with-out-ext=openssl,readline,dbm,gdbm,win32ole \
--with-static-linked-ext \ --with-static-linked-ext \
--disable-rubygems \ --disable-rubygems \
--without-gmp --without-gmp