snxrzx
/
mkxp-sunshine
mirror of https://forgejo.xatacraft.ru/Sunshine/mkxp-sunshine.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

efjgfrdn8her50ny0hteri0jhermippg

This commit is contained in:
ZakatTeamI2P 2026-03-30 22:13:59 +04:00
parent 7ae600021a
commit 5ae9caaf39
7 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5) cmake_minimum_required(VERSION 3.14)
Project(oneshot) Project(oneshot)
## Setup options ## ## Setup options ##
@ -293,7 +293,7 @@ find_package(Boost REQUIRED)
find_package(PhysFS) find_package(PhysFS)
find_path(PIXMAN_INCLUDE_DIR NAMES pixman.h PATH_SUFFIXES pixman-1) find_path(PIXMAN_INCLUDE_DIR NAMES pixman.h PATH_SUFFIXES pixman-1)
find_library(PIXMAN_LIBRARY NAMES pixman-1 pixman-1_static pixman-1_staticd) find_library(PIXMAN_LIBRARY NAMES pixman-1 pixman-1_static pixman-1_staticd)
find_package(Ruby 3.3) find_package(Ruby COMPONENTS Interpreter Development REQUIRED)
pkg_check_modules(SIGC2 REQUIRED sigc++-2.0) pkg_check_modules(SIGC2 REQUIRED sigc++-2.0)
find_package_handle_standard_args(pixman-1 DEFAULT_MSG PIXMAN_LIBRARY PIXMAN_INCLUDE_DIR) find_package_handle_standard_args(pixman-1 DEFAULT_MSG PIXMAN_LIBRARY PIXMAN_INCLUDE_DIR)
if(PIXMAN-1_FOUND) if(PIXMAN-1_FOUND)
@ -304,8 +304,8 @@ endif()
mark_as_advanced(PIXMAN_INCLUDE_DIR PIXMAN_LIBRARY) mark_as_advanced(PIXMAN_INCLUDE_DIR PIXMAN_LIBRARY)
target_compile_definitions(${PROJECT_NAME} PRIVATE ${DEFINES}) target_compile_definitions(${PROJECT_NAME} PRIVATE ${DEFINES})
target_include_directories(${PROJECT_NAME} PRIVATE src ${PIXMAN_INCLUDE_DIRS} ${SIGC2_INCLUDE_DIRS}) target_include_directories(${PROJECT_NAME} PRIVATE src ${PIXMAN_INCLUDE_DIRS} ${SIGC2_INCLUDE_DIRS} ${RUBY_INCLUDE_DIRS})
target_link_libraries(${PROJECT_NAME} PRIVATE SDL3::SDL3 SDL3_image::SDL3_image SDL3_sound::SDL3_sound SDL3_ttf::SDL3_ttf Boost::boost OpenAL::OpenAL physfs ${PIXMAN_LIBRARIES} ${SIGC2_INCLUDE_DIRS} ${PLATFORM_LIBRARIES}) target_link_libraries(${PROJECT_NAME} PRIVATE SDL3::SDL3 SDL3_image::SDL3_image SDL3_sound::SDL3_sound SDL3_ttf::SDL3_ttf Boost::boost OpenAL::OpenAL physfs ${PIXMAN_LIBRARIES} ${SIGC2_INCLUDE_DIRS} ${PLATFORM_LIBRARIES} ${RUBY_LIBRARIES})
IF(APPLE) IF(APPLE)
add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND cmake -P "${CMAKE_SOURCE_DIR}/patches/mac/CompleteBundle.cmake" VERBATIM) add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND cmake -P "${CMAKE_SOURCE_DIR}/patches/mac/CompleteBundle.cmake" VERBATIM)

2
src/bitmap.cpp
View File

@ -444,7 +444,7 @@ void Bitmap::stretchBlt(const IntRect &destRect,
SDL_Surface *blitTemp = SDL_Surface *blitTemp =
SDL_CreateRGBSurface(0, destRect.w, destRect.h, bpp, rMask, gMask, bMask, aMask); SDL_CreateRGBSurface(0, destRect.w, destRect.h, bpp, rMask, gMask, bMask, aMask);
SDL_BlitScaled(srcSurf, &srcRect, blitTemp, 0); SDL_BlitSurfaceScaled(srcSurf, &srcRect, blitTemp, 0);
TEX::bind(p->gl.tex); TEX::bind(p->gl.tex);

4
src/eventthread.cpp
View File

@ -619,7 +619,7 @@ void EventThread::resetInputStates(){
} }
void EventThread::setFullscreen(SDL_Window *win, bool mode){ void EventThread::setFullscreen(SDL_Window *win, bool mode){
SDL_SetWindowFullscreen(win, mode ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0); SDL_SetWindowFullscreen(win, mode);
fullscreen = mode; fullscreen = mode;
} }
@ -825,7 +825,7 @@ void SyncPoint::Util::waitForUnlock()
SDL_LockMutex(mut); SDL_LockMutex(mut);
while (locked) while (locked)
SDL_CondWait(cond, mut); SDL_WaitCondition(cond, mut);
SDL_UnlockMutex(mut); SDL_UnlockMutex(mut);
} }

8
src/filesystem.cpp
View File

@ -78,12 +78,12 @@ static PHYSFS_sint64 SDLRWIoRead(struct PHYSFS_Io *io, void *buf, PHYSFS_uint64
static int SDLRWIoSeek(struct PHYSFS_Io *io, PHYSFS_uint64 offset) static int SDLRWIoSeek(struct PHYSFS_Io *io, PHYSFS_uint64 offset)
{ {
return (SDL_SeekIO(getSDLRWops(io), offset, RW_SEEK_SET) != -1); return (SDL_SeekIO(getSDLRWops(io), offset, SDL_IO_SEEK_SET) != -1);
} }
static PHYSFS_sint64 SDLRWIoTell(struct PHYSFS_Io *io) static PHYSFS_sint64 SDLRWIoTell(struct PHYSFS_Io *io)
{ {
return SDL_SeekIO(getSDLRWops(io), 0, RW_SEEK_CUR); return SDL_SeekIO(getSDLRWops(io), 0, SDL_IO_SEEK_CUR);
} }
static PHYSFS_sint64 SDLRWIoLength(struct PHYSFS_Io *io) static PHYSFS_sint64 SDLRWIoLength(struct PHYSFS_Io *io)
@ -143,12 +143,12 @@ static PHYSFS_Io *createSDLRWIo(const char *filename)
return io; return io;
} }
static inline PHYSFS_File *sdlPHYS(SDL_RWops *ops) static inline PHYSFS_File *sdlPHYS(SDL_IOStream *ops)
{ {
return static_cast<PHYSFS_File*>(ops->hidden.unknown.data1); return static_cast<PHYSFS_File*>(ops->hidden.unknown.data1);
} }
static Sint64 SDL_RWopsSize(SDL_RWops *ops) static Sint64 SDL_RWopsSize(SDL_IOStream *ops)
{ {
PHYSFS_File *f = sdlPHYS(ops); PHYSFS_File *f = sdlPHYS(ops);

26
src/keybindings.cpp
View File

@ -111,14 +111,14 @@ static const GcBindingData defaultGcBindings[] =
{ SDL_GAMEPAD_BUTTON_DPAD_RIGHT, Input::Right }, { SDL_GAMEPAD_BUTTON_DPAD_RIGHT, Input::Right },
{ SDL_GAMEPAD_BUTTON_DPAD_UP, Input::Up }, { SDL_GAMEPAD_BUTTON_DPAD_UP, Input::Up },
{ SDL_GAMEPAD_BUTTON_DPAD_DOWN, Input::Down }, { SDL_GAMEPAD_BUTTON_DPAD_DOWN, Input::Down },
{ SDL_GAMEPAD_BUTTON_A, Input::Action }, { SDL_GAMEPAD_BUTTON_SOUTH, Input::Action },
{ SDL_GAMEPAD_BUTTON_B, Input::Cancel }, { SDL_GAMEPAD_BUTTON_EAST, Input::Cancel },
{ SDL_GAMEPAD_BUTTON_X, Input::Run }, { SDL_GAMEPAD_BUTTON_WEST, Input::Run },
{ SDL_GAMEPAD_BUTTON_Y, Input::Items }, { SDL_GAMEPAD_BUTTON_NORTH, Input::Items },
{ SDL_GAMEPAD_BUTTON_START, Input::Menu }, { SDL_GAMEPAD_BUTTON_START, Input::Menu },
{ SDL_GAMEPAD_BUTTON_BACK, Input::Deactivate }, { SDL_GAMEPAD_BUTTON_BACK, Input::Deactivate },
{ SDL_GAMEPAD_BUTTON_LEFTSHOULDER, Input::L }, { SDL_GAMEPAD_BUTTON_LEFT_SHOULDER, Input::L },
{ SDL_GAMEPAD_BUTTON_RIGHTSHOULDER, Input::R }, { SDL_GAMEPAD_BUTTON_RIGHT_SHOULDER, Input::R },
}; };
static elementsN(defaultGcBindings); static elementsN(defaultGcBindings);
@ -147,12 +147,12 @@ BDescVec genDefaultBindings()
for (size_t i = 0; i < defaultGcBindingsN; ++i) for (size_t i = 0; i < defaultGcBindingsN; ++i)
defaultGcBindings[i].add(d); defaultGcBindings[i].add(d);
addGcAxisBinding(d, SDL_CONTROLLER_AXIS_LEFTX, Negative, Input::Left ); addGcAxisBinding(d, SDL_GAMEPAD_AXIS_LEFTX, Negative, Input::Left );
addGcAxisBinding(d, SDL_CONTROLLER_AXIS_LEFTX, Positive, Input::Right ); addGcAxisBinding(d, SDL_GAMEPAD_AXIS_LEFTX, Positive, Input::Right );
addGcAxisBinding(d, SDL_CONTROLLER_AXIS_LEFTY, Negative, Input::Up ); addGcAxisBinding(d, SDL_GAMEPAD_AXIS_LEFTY, Negative, Input::Up );
addGcAxisBinding(d, SDL_CONTROLLER_AXIS_LEFTY, Positive, Input::Down ); addGcAxisBinding(d, SDL_GAMEPAD_AXIS_LEFTY, Positive, Input::Down );
addGcAxisBinding(d, SDL_CONTROLLER_AXIS_TRIGGERLEFT, Positive, Input::Deactivate); addGcAxisBinding(d, SDL_GAMEPAD_AXIS_LEFT_TRIGGER, Positive, Input::Deactivate);
addGcAxisBinding(d, SDL_CONTROLLER_AXIS_TRIGGERRIGHT, Positive, Input::Run ); addGcAxisBinding(d, SDL_GAMEPAD_AXIS_RIGHT_TRIGGER, Positive, Input::Run );
return d; return d;
} }
@ -246,7 +246,7 @@ static bool verifyDesc(const BindingDesc &desc)
case Invalid: case Invalid:
return true; return true;
case Key: case Key:
return src.d.scan < SDL_NUM_SCANCODES; return src.d.scan < SDL_SCANCODE_COUNT;
case CButton: case CButton:
case JButton: case JButton:
return true; return true;

2
src/screen.cpp
View File

@ -1,5 +1,5 @@
#include <SDL3/SDL.h> #include <SDL3/SDL.h>
#include <SDL3/SDL_shape.h> #include <SDL3/SDL_video.h>
#include <SDL3_image/SDL_image.h> #include <SDL3_image/SDL_image.h>
#define FPS 60 #define FPS 60

10
src/settingsmenu.cpp
View File

@ -184,9 +184,9 @@ std::string sourceDescString(const SourceDesc &src)
return findtext(TRSTR_KEYBIND_RSTICKU, "Right Stick (Up)"); return findtext(TRSTR_KEYBIND_RSTICKU, "Right Stick (Up)");
else else
return findtext(TRSTR_KEYBIND_RSTICKD, "Right Stick (Down)"); return findtext(TRSTR_KEYBIND_RSTICKD, "Right Stick (Down)");
case SDL_GAMEPAD_AXIS_TRIGGERLEFT: case SDL_GAMEPAD_AXIS_LEFT_TRIGGER:
return findtext(TRSTR_KEYBIND_LTRIGGER, "Left Trigger"); return findtext(TRSTR_KEYBIND_LTRIGGER, "Left Trigger");
case SDL_GAMEPAD_AXIS_TRIGGERRIGHT: case SDL_GAMEPAD_AXIS_RIGHT_TRIGGER:
return findtext(TRSTR_KEYBIND_RTRIGGER, "Right Trigger"); return findtext(TRSTR_KEYBIND_RTRIGGER, "Right Trigger");
} }
return ""; return "";
@ -410,7 +410,7 @@ struct SettingsMenuPrivate
uint8_t r, uint8_t g, uint8_t b) uint8_t r, uint8_t g, uint8_t b)
{ {
SDL_Rect rect = { drawOff.x+x, drawOff.y+y, w, h }; SDL_Rect rect = { drawOff.x+x, drawOff.y+y, w, h };
SDL_FillRect(surf, &rect, SDL_MapRGB(rgb, r, g, b)); SDL_FillSurfaceRect(surf, &rect, SDL_MapRGB(rgb, r, g, b));
} }
void fillRect(SDL_Surface *surf, uint8_t grey, void fillRect(SDL_Surface *surf, uint8_t grey,
@ -1189,8 +1189,8 @@ bool SettingsMenu::onEvent(const SDL_Event &event,
switch (event.type) switch (event.type)
{ {
/* Ignore these event */ /* Ignore these event */
case SDL_MOUSEBUTTONUP : case SDL_EVENT_MOUSE_BUTTON_UP :
case SDL_KEYUP : case SDL_EVENT_KEY_UP :
return true; return true;
case SDL_WINDOWEVENT : case SDL_WINDOWEVENT :