Skip to content

Fix GCC 15 issues #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
uyjulian merged 1 commit into from
May 19, 2025
Merged

Fix GCC 15 issues #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# Licenced under Academic Free License version 2.0
# Review gsKit README & LICENSE files for further details.

cmake_minimum_required(VERSION 3.0.0)
cmake_minimum_required(VERSION 3.0...3.12)

project(gsKit)

Expand Down Expand Up @@ -337,7 +337,7 @@ endif()
if(NOT SKIP_BUILD_EXAMPLES)
set(CMAKE_EXECUTABLE_SUFFIX .elf)
set(GSKIT_SAMPLE_LIBS "")
list(APPEND GSKIT_SAMPLE_LIBS gskit dmakit gskit_toolkit ${GSKIT_EXTERNAL_LIBS})
list(APPEND GSKIT_SAMPLE_LIBS gskit_toolkit gskit dmakit ${GSKIT_EXTERNAL_LIBS})

macro (add_executable_example targetname)
add_executable(${targetname}
Expand Down
6 changes: 3 additions & 3 deletions ee/gs/include/gsCore.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,19 +141,19 @@ void gsKit_hsync_wait(void);
void gsKit_vsync_nowait(void);

/// Installs a vsync interrupt handler (vblank_start)
int gsKit_add_vsync_handler(int (*vsync_callback)());
int gsKit_add_vsync_handler(int (*vsync_callback)(int));

/// Removes a vsync interrupt handler
void gsKit_remove_vsync_handler(int callback_id);

/// Installs a hsync interrupt handler (hblank_start)
int gsKit_add_hsync_handler(int (*hsync_callback)());
int gsKit_add_hsync_handler(int (*hsync_callback)(int));

/// Removes a hsync interrupt handler
void gsKit_remove_hsync_handler(int callback_id);

/// Installs a finish interrupt handler
int gsKit_add_finish_handler(int (*finish_callback)());
int gsKit_add_finish_handler(int (*finish_callback)(int));

/// Removes a finish interrupt handler
void gsKit_remove_finish_handler(int callback_id);
Expand Down
6 changes: 3 additions & 3 deletions ee/gs/src/gsCore.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ void gsKit_hsync_wait(void)
#endif

#if F_gsKit_add_vsync_handler
int gsKit_add_vsync_handler(int (*vsync_callback)())
int gsKit_add_vsync_handler(int (*vsync_callback)(int))
{
int callback_id;

Expand Down Expand Up @@ -225,7 +225,7 @@ void gsKit_remove_vsync_handler(int callback_id)
#endif

#if F_gsKit_add_hsync_handler
int gsKit_add_hsync_handler(int (*hsync_callback)())
int gsKit_add_hsync_handler(int (*hsync_callback)(int))
{
int callback_id;

Expand Down Expand Up @@ -253,7 +253,7 @@ void gsKit_remove_hsync_handler(int callback_id)
#endif

#if F_gsKit_add_finish_handler
int gsKit_add_finish_handler(int (*finish_callback)())
int gsKit_add_finish_handler(int (*finish_callback)(int))
{
int callback_id;

Expand Down
2 changes: 1 addition & 1 deletion ee/gs/src/gsHires.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ int gsKit_hires_set_bg(GSGLOBAL *gsGlobal, GSTEXTURE * tex)
#endif

#if F_gsKit_hires_init_screen
static int hsync_callback()
static int hsync_callback(int cause)
{
u32 iPass;

Expand Down
2 changes: 1 addition & 1 deletion examples/vsync/vsync.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ float VHeight;
volatile int vsync_num = 0;
int frame_num = 0;

static int vsync_callback(void)
static int vsync_callback(int cause)
{
gsKit_display_buffer(gsGlobal); // working buffer gets displayed

Expand Down