[Scummvm-git-logs] scummvm master -> 65aed42e7f3db06b6b742c9b52eda7744cca0f85

spleen1981 noreply at scummvm.org
Tue May 2 16:03:34 UTC 2023


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
65aed42e7f LIBRETRO: add retroDestroy()


Commit: 65aed42e7f3db06b6b742c9b52eda7744cca0f85
    https://github.com/scummvm/scummvm/commit/65aed42e7f3db06b6b742c9b52eda7744cca0f85
Author: Giovanni Cascione (ing.cascione at gmail.com)
Date: 2023-05-02T18:03:15+02:00

Commit Message:
LIBRETRO: add retroDestroy()

Changed paths:
    backends/platform/libretro/include/os.h
    backends/platform/libretro/src/libretro-os.cpp
    backends/platform/libretro/src/libretro.cpp


diff --git a/backends/platform/libretro/include/os.h b/backends/platform/libretro/include/os.h
index 8fdd994964b..135fb7d328d 100644
--- a/backends/platform/libretro/include/os.h
+++ b/backends/platform/libretro/include/os.h
@@ -94,4 +94,6 @@ void retroKeyEvent(bool down, unsigned keycode, uint32_t character, uint16_t key
 
 uint8 getThreadSwitchCaller(void);
 
+void retroDestroy(void);
+
 #endif
diff --git a/backends/platform/libretro/src/libretro-os.cpp b/backends/platform/libretro/src/libretro-os.cpp
index b56a3828912..16f3be99550 100644
--- a/backends/platform/libretro/src/libretro-os.cpp
+++ b/backends/platform/libretro/src/libretro-os.cpp
@@ -1300,6 +1300,10 @@ public:
 		dynamic_cast<OSystem_RETRO *>(g_system)->getEventManager()->resetQuit();
 	}
 
+	void destroy() {
+		delete this;
+	}
+
 };
 
 OSystem *retroBuildOS() {
@@ -1341,3 +1345,7 @@ void retroReset() {
 uint8 getThreadSwitchCaller(){
 	return dynamic_cast<OSystem_RETRO *>(g_system)->getThreadSwitchCaller();
 }
+
+void retroDestroy() {
+	dynamic_cast<OSystem_RETRO *>(g_system)->destroy();
+}
diff --git a/backends/platform/libretro/src/libretro.cpp b/backends/platform/libretro/src/libretro.cpp
index eee2e486303..f1b0222be43 100644
--- a/backends/platform/libretro/src/libretro.cpp
+++ b/backends/platform/libretro/src/libretro.cpp
@@ -568,7 +568,7 @@ void retro_init(void) {
 }
 
 void retro_deinit(void) {
-	g_system->destroy();
+	retroDestroy();
 	free(sound_buffer);
 }
 




More information about the Scummvm-git-logs mailing list