Merge pull request #93 from fjtrujy/gcc15

Fix GCC 15 issues

Author: uyjulian

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}

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);

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;
 

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;
 

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