LIBRETRO: move libretro.cpp to libretro-core and add header file

backends/platform/libretro/Makefile.common

@@ -118,7 +118,7 @@ endif
 INCLUDES     += -I$(ROOT_PATH)/include
 MODULE_PATHS += $(CORE_PATH)
 
-LIBRETRO_OBJS := $(CORE_PATH)/libretro.o \
+LIBRETRO_OBJS := $(CORE_PATH)/libretro-core.o \
 	$(CORE_PATH)/libretro-fs.o \
 	$(CORE_PATH)/libretro-fs-factory.o \
 	$(CORE_PATH)/libretro-os-base.o \

backends/platform/libretro/include/libretro-core.h

@@ -0,0 +1,43 @@
+/* Copyright (C) 2023 Giovanni Cascione <ing.cascione@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef LIBRETRO_CORE_H
+#define LIBRETRO_CORE_H
+
+#include <libretro.h>
+
+extern retro_log_printf_t retro_log_cb;
+extern retro_input_state_t retro_input_cb;
+
+bool retro_get_input_bitmask_supported(void);
+void reset_performance_tuner(void);
+void retro_osd_notification(const char* msg);
+int retro_get_input_device(void);
+const char * retro_get_system_dir(void);
+const char * retro_get_save_dir(void);
+
+bool retro_setting_get_timing_inaccuracies_enabled(void);
+float retro_setting_get_frame_rate(void);
+uint16_t retro_setting_get_sample_rate(void);
+int retro_setting_get_analog_deadzone(void);
+bool retro_setting_get_analog_response_is_quadratic(void);
+float retro_setting_get_mouse_speed(void);
+int retro_setting_get_mouse_fine_control_speed_reduction(void);
+float retro_setting_get_gamepad_cursor_speed(void);
+float retro_setting_get_gamepad_acceleration_time(void);
+
+#endif // LIBRETRO_CORE_H

backends/platform/libretro/include/libretro-os.h

@@ -17,10 +17,6 @@
 #ifndef BACKENDS_LIBRETRO_OS_H
 #define BACKENDS_LIBRETRO_OS_H
 
-#include <libretro.h>
-#include <features/features_cpu.h>
-#include <retro_miscellaneous.h>
-
 #include "audio/mixer_intern.h"
 #include "base/main.h"
 #include "backends/base-backend.h"
@@ -40,24 +36,6 @@
 
 #define LIBRETRO_G_SYSTEM dynamic_cast<OSystem_libretro *>(g_system)
 
-/* libretro.cpp functions */
-extern retro_log_printf_t retro_log_cb;
-extern retro_input_state_t retro_input_cb;
-extern bool retro_setting_get_timing_inaccuracies_enabled(void);
-extern float retro_setting_get_frame_rate(void);
-extern uint16 retro_setting_get_sample_rate(void);
-extern int retro_setting_get_analog_deadzone(void);
-extern bool retro_setting_get_analog_response_is_quadratic(void);
-extern float retro_setting_get_mouse_speed(void);
-extern int retro_setting_get_mouse_fine_control_speed_reduction(void);
-extern float retro_setting_get_gamepad_cursor_speed(void);
-extern float retro_setting_get_gamepad_acceleration_time(void);
-extern void reset_performance_tuner(void);
-extern void retro_osd_notification(const char* msg);
-extern int retro_get_input_device(void);
-extern const char * retro_get_system_dir(void);
-extern const char * retro_get_save_dir(void);
-
 /**
  *  Dummy mutex implementation
  */

backends/platform/libretro/src/libretro-core.cpp

@@ -1,8 +1,4 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
+/* Copyright (C) 2023 Giovanni Cascione <ing.cascione@gmail.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,7 +17,6 @@
 
 #define FORBIDDEN_SYMBOL_ALLOW_ALL
 
-#include <libretro.h>
 #include "audio/mixer_intern.h"
 #include "base/main.h"
 #include "common/scummsys.h"
@@ -50,10 +45,11 @@
 #define INCLUDED_FROM_BASE_VERSION_CPP
 #include "base/internal_version.h"
 
+#include "backends/platform/libretro/include/libretro-defs.h"
+#include "backends/platform/libretro/include/libretro-core.h"
 #include "backends/platform/libretro/include/libretro-threads.h"
 #include "backends/platform/libretro/include/libretro-core-options.h"
 #include "backends/platform/libretro/include/libretro-os.h"
-#include "backends/platform/libretro/include/libretro-defs.h"
 #include "backends/platform/libretro/include/libretro-mapper.h"
 
 static struct retro_game_info game_buf;

backends/platform/libretro/src/libretro-os-base.cpp

@@ -23,15 +23,19 @@
 #define FS_SYSTEM_FACTORY LibRetroFilesystemFactory
 #endif
 
+#include <features/features_cpu.h>
+
 #include "audio/mixer_intern.h"
 #include "backends/base-backend.h"
 #include "common/config-manager.h"
 #include "common/system.h"
 #include "graphics/surface.h"
+
 #include "backends/saves/default/default-saves.h"
+#include "backends/platform/libretro/include/libretro-defs.h"
+#include "backends/platform/libretro/include/libretro-core.h"
 #include "backends/platform/libretro/include/libretro-timer.h"
 #include "backends/platform/libretro/include/libretro-os.h"
-#include "backends/platform/libretro/include/libretro-defs.h"
 
 OSystem_libretro::OSystem_libretro() : _mousePaletteEnabled(false), _mouseVisible(false), _mouseX(0), _mouseY(0), _mouseXAcc(0.0), _mouseYAcc(0.0), _mouseHotspotX(0), _mouseHotspotY(0), _dpadXAcc(0.0), _dpadYAcc(0.0), _dpadXVel(0.0f), _dpadYVel(0.0f), _mouseKeyColor(0), _mouseDontScale(false), _mixer(0), _startTime(0), _threadSwitchCaller(0), _cursorStatus(0) {
 	_fsFactory = new FS_SYSTEM_FACTORY();

backends/platform/libretro/src/libretro-os-events.cpp

@@ -20,9 +20,11 @@
 
 #include "common/list.h"
 #include "common/events.h"
+
+#include "backends/platform/libretro/include/libretro-defs.h"
+#include "backends/platform/libretro/include/libretro-core.h"
 #include "backends/platform/libretro/include/libretro-os.h"
 #include "backends/platform/libretro/include/libretro-timer.h"
-#include "backends/platform/libretro/include/libretro-defs.h"
 
 Common::List<Common::Event> OSystem_libretro::_events;
 

backends/platform/libretro/src/libretro-os-graphics.cpp

@@ -17,13 +17,14 @@
 
 #include <retro_inline.h>
 
-//#include "common/system.h"
 #include "graphics/colormasks.h"
 #include "graphics/palette.h"
 #include "graphics/surface.h"
+
+#include "backends/platform/libretro/include/libretro-defs.h"
+#include "backends/platform/libretro/include/libretro-core.h"
 #include "backends/platform/libretro/include/libretro-os.h"
 #include "backends/platform/libretro/include/libretro-timer.h"
-#include "backends/platform/libretro/include/libretro-defs.h"
 
 static INLINE void blit_uint8_uint16_fast(Graphics::Surface &aOut, const Graphics::Surface &aIn, const LibretroPalette &aColors) {
 	for (int i = 0; i < aIn.h; i++) {

backends/platform/libretro/src/libretro-os-inputs.cpp

@@ -17,10 +17,10 @@
 #define FORBIDDEN_SYMBOL_EXCEPTION_strcpy
 #define FORBIDDEN_SYMBOL_EXCEPTION_strcat
 
-#include <libretro.h>
+#include "backends/platform/libretro/include/libretro-defs.h"
+#include "backends/platform/libretro/include/libretro-core.h"
 #include "backends/platform/libretro/include/libretro-os.h"
 #include "backends/platform/libretro/include/libretro-mapper.h"
-#include "backends/platform/libretro/include/libretro-defs.h"
 
 void OSystem_libretro::updateMouseXY(float deltaAcc, float *cumulativeXYAcc, int doing_x) {
 	int *mouseXY;

backends/platform/libretro/src/libretro-os-utils.cpp

@@ -17,11 +17,14 @@
 #define FORBIDDEN_SYMBOL_EXCEPTION_time
 
 #include <features/features_cpu.h>
+
 #include "common/tokenizer.h"
 #include "common/config-manager.h"
 #include "base/commandLine.h"
-#include "backends/platform/libretro/include/libretro-os.h"
+
 #include "backends/platform/libretro/include/libretro-defs.h"
+#include "backends/platform/libretro/include/libretro-core.h"
+#include "backends/platform/libretro/include/libretro-os.h"
 
 void OSystem_libretro::getTimeAndDate(TimeDate &t, bool skipRecord) const {
 	uint32 curTime = (uint32) (cpu_features_get_time_usec() / 1000000);