snxrzx/mkxp-sunshine
1
0
Fork 0
mirror of https://forgejo.xatacraft.ru/Sunshine/mkxp-sunshine.git synced 2026-08-20 22:09:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ia pidoras

Browse source
This commit is contained in:
ZakatTeamI2P 2026-03-30 22:45:44 +04:00
parent 01ad634093
commit fa016d495b
5 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -130,7 +130,7 @@ elseif(APPLE)
list(APPEND MAIN_SOURCE src/mac-desktop.mm) list(APPEND MAIN_SOURCE src/mac-desktop.mm)
else() else()
find_package(PkgConfig REQUIRED) 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}) include_directories(${LINUXPKGS_INCLUDE_DIRS})
add_compile_options(${LINUXPKGS_CFLAGS_OTHER}) add_compile_options(${LINUXPKGS_CFLAGS_OTHER})
list(APPEND PLATFORM_LIBRARIES ${LINUXPKGS_LDFLAGS}) list(APPEND PLATFORM_LIBRARIES ${LINUXPKGS_LDFLAGS})

4
src/eventthread.cpp
View file

@ -382,11 +382,11 @@ void EventThread::process(RGSSThreadData &rtData)
break; break;
case SDL_EVENT_GAMEPAD_BUTTON_DOWN: case SDL_EVENT_GAMEPAD_BUTTON_DOWN:
gcState.buttons[event.cbutton.button] = true; gcState.buttons[event.gbutton.button] = true;
break; break;
case SDL_EVENT_GAMEPAD_BUTTON_UP: case SDL_EVENT_GAMEPAD_BUTTON_UP:
gcState.buttons[event.cbutton.button] = false; gcState.buttons[event.gbutton.button] = false;
break; break;
case SDL_EVENT_GAMEPAD_AXIS_MOTION: case SDL_EVENT_GAMEPAD_AXIS_MOTION:

3
src/oneshot.cpp
View file

@ -98,8 +98,7 @@ struct linux_DialogData
bool result; bool result;
}; };
static int linux_dialog(void *rawData) static int linux_dialog(void *rawData){
{
linux_DialogData *data = reinterpret_cast<linux_DialogData*>(rawData); linux_DialogData *data = reinterpret_cast<linux_DialogData*>(rawData);
// Determine correct flags // Determine correct flags

4
src/settingsmenu.cpp
View file

@ -739,7 +739,7 @@ struct SettingsMenuPrivate
case SDL_EVENT_GAMEPAD_BUTTON_DOWN: case SDL_EVENT_GAMEPAD_BUTTON_DOWN:
desc.type = CButton; desc.type = CButton;
desc.d.jb = event.cbutton.button; desc.d.jb = event.gbutton.button;
break; break;
case SDL_EVENT_GAMEPAD_AXIS_MOTION: case SDL_EVENT_GAMEPAD_AXIS_MOTION:
@ -758,7 +758,7 @@ struct SettingsMenuPrivate
case SDL_EVENT_JOYSTICK_BUTTON_DOWN: case SDL_EVENT_JOYSTICK_BUTTON_DOWN:
desc.type = JButton; desc.type = JButton;
desc.d.jb = event.cbutton.button; desc.d.jb = event.gbutton.button;
break; break;
case SDL_EVENT_JOYSTICK_HAT_MOTION: case SDL_EVENT_JOYSTICK_HAT_MOTION:

10
src/vorbissource.cpp
View file

@ -27,19 +27,19 @@
#include <vector> #include <vector>
#include <algorithm> #include <algorithm>
static size_t vfRead(void *ptr, size_t size, size_t nmemb, void *ops) 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_RWread(static_cast<SDL_IOStream*>(ops), ptr, size, nmemb); return SDL_ReadIO(static_cast<SDL_IOStream*>(ops), ptr, size);
} }
static int vfSeek(void *ops, ogg_int64_t offset, int whence) 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) 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 = static ov_callbacks OvCallbacks =