mirror of
https://forgejo.xatacraft.ru/Sunshine/mkxp-sunshine.git
synced 2026-08-19 21:39:57 +00:00
ia pidoras
This commit is contained in:
parent
01ad634093
commit
fa016d495b
5 changed files with 11 additions and 12 deletions
|
|
@ -130,7 +130,7 @@ elseif(APPLE)
|
|||
list(APPEND MAIN_SOURCE src/mac-desktop.mm)
|
||||
else()
|
||||
find_package(PkgConfig REQUIRED)
|
||||
pkg_check_modules(LINUXPKGS REQUIRED gtk4 libxfconf-0)
|
||||
pkg_check_modules(LINUXPKGS REQUIRED gtk+-3.0 libxfconf-0)
|
||||
include_directories(${LINUXPKGS_INCLUDE_DIRS})
|
||||
add_compile_options(${LINUXPKGS_CFLAGS_OTHER})
|
||||
list(APPEND PLATFORM_LIBRARIES ${LINUXPKGS_LDFLAGS})
|
||||
|
|
|
|||
|
|
@ -382,11 +382,11 @@ void EventThread::process(RGSSThreadData &rtData)
|
|||
break;
|
||||
|
||||
case SDL_EVENT_GAMEPAD_BUTTON_DOWN:
|
||||
gcState.buttons[event.cbutton.button] = true;
|
||||
gcState.buttons[event.gbutton.button] = true;
|
||||
break;
|
||||
|
||||
case SDL_EVENT_GAMEPAD_BUTTON_UP:
|
||||
gcState.buttons[event.cbutton.button] = false;
|
||||
gcState.buttons[event.gbutton.button] = false;
|
||||
break;
|
||||
|
||||
case SDL_EVENT_GAMEPAD_AXIS_MOTION:
|
||||
|
|
|
|||
|
|
@ -98,8 +98,7 @@ struct linux_DialogData
|
|||
bool result;
|
||||
};
|
||||
|
||||
static int linux_dialog(void *rawData)
|
||||
{
|
||||
static int linux_dialog(void *rawData){
|
||||
linux_DialogData *data = reinterpret_cast<linux_DialogData*>(rawData);
|
||||
|
||||
// Determine correct flags
|
||||
|
|
|
|||
|
|
@ -739,7 +739,7 @@ struct SettingsMenuPrivate
|
|||
|
||||
case SDL_EVENT_GAMEPAD_BUTTON_DOWN:
|
||||
desc.type = CButton;
|
||||
desc.d.jb = event.cbutton.button;
|
||||
desc.d.jb = event.gbutton.button;
|
||||
break;
|
||||
|
||||
case SDL_EVENT_GAMEPAD_AXIS_MOTION:
|
||||
|
|
@ -758,7 +758,7 @@ struct SettingsMenuPrivate
|
|||
|
||||
case SDL_EVENT_JOYSTICK_BUTTON_DOWN:
|
||||
desc.type = JButton;
|
||||
desc.d.jb = event.cbutton.button;
|
||||
desc.d.jb = event.gbutton.button;
|
||||
break;
|
||||
|
||||
case SDL_EVENT_JOYSTICK_HAT_MOTION:
|
||||
|
|
|
|||
|
|
@ -27,19 +27,19 @@
|
|||
#include <vector>
|
||||
#include <algorithm>
|
||||
|
||||
static size_t vfRead(void *ptr, size_t size, size_t nmemb, void *ops)
|
||||
{
|
||||
return SDL_RWread(static_cast<SDL_IOStream*>(ops), ptr, size, nmemb);
|
||||
static size_t vfRead(void *ptr, size_t size, void *ops){
|
||||
//size_t SDL_ReadIO(SDL_IOStream *context, void *ptr, size_t size);
|
||||
return SDL_ReadIO(static_cast<SDL_IOStream*>(ops), ptr, size);
|
||||
}
|
||||
|
||||
static int vfSeek(void *ops, ogg_int64_t offset, int whence)
|
||||
{
|
||||
return SDL_RWseek(static_cast<SDL_IOStream*>(ops), offset, whence);
|
||||
return SDL_SeekIO(static_cast<SDL_IOStream*>(ops), offset, whence);
|
||||
}
|
||||
|
||||
static long vfTell(void *ops)
|
||||
{
|
||||
return SDL_RWtell(static_cast<SDL_IOStream*>(ops));
|
||||
return SDL_TellIO(static_cast<SDL_IOStream*>(ops));
|
||||
}
|
||||
|
||||
static ov_callbacks OvCallbacks =
|
||||
|
|
|
|||
Loading…
Reference in a new issue