From 8f7b58c22608de7d7e9c68b459d1d66a4a24452d Mon Sep 17 00:00:00 2001 From: Francisco Javier Trujillo Mata Date: Mon, 19 May 2025 23:40:02 +0200 Subject: [PATCH] Fix GCC 15 issues --- CMakeLists.txt | 4 ++-- ee/gs/include/gsCore.h | 6 +++--- ee/gs/src/gsCore.c | 6 +++--- ee/gs/src/gsHires.c | 2 +- examples/vsync/vsync.c | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e8a3ec7..f6ddc18 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) @@ -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} diff --git a/ee/gs/include/gsCore.h b/ee/gs/include/gsCore.h index e76c453..4a9b0e9 100644 --- a/ee/gs/include/gsCore.h +++ b/ee/gs/include/gsCore.h @@ -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); diff --git a/ee/gs/src/gsCore.c b/ee/gs/src/gsCore.c index ef66214..488ae6b 100644 --- a/ee/gs/src/gsCore.c +++ b/ee/gs/src/gsCore.c @@ -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; @@ -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; @@ -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; diff --git a/ee/gs/src/gsHires.c b/ee/gs/src/gsHires.c index 1498f91..dd6dbae 100644 --- a/ee/gs/src/gsHires.c +++ b/ee/gs/src/gsHires.c @@ -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; diff --git a/examples/vsync/vsync.c b/examples/vsync/vsync.c index 3df720c..1353ba2 100644 --- a/examples/vsync/vsync.c +++ b/examples/vsync/vsync.c @@ -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