[Scummvm-git-logs] scummvm master -> a062f06bd11a0104eb1af9a0bdbd4132c2abf7e4

spleen1981 noreply at scummvm.org
Thu May 11 18:50:58 UTC 2023


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

Summary:
bf7938991d LIBRETRO: update libretro-common
20ce78d889 LIBRETRO: move retroQuit in close_emu_thread loop
3590bb387c LIBRETRO: add osd_notification
2e98da4e9e LIBRETRO: add core path as fallback for system and save folders
a062f06bd1 LIBRETRO: add auto setup for extra/theme folders


Commit: bf7938991dc6a62a450eb2ac3e5bcc0158921afa
    https://github.com/scummvm/scummvm/commit/bf7938991dc6a62a450eb2ac3e5bcc0158921afa
Author: Giovanni Cascione (ing.cascione at gmail.com)
Date: 2023-05-11T20:49:54+02:00

Commit Message:
LIBRETRO: update libretro-common

Changed paths:
    backends/platform/libretro/dependencies.mk


diff --git a/backends/platform/libretro/dependencies.mk b/backends/platform/libretro/dependencies.mk
index 5cda950a8e5..d3394a2cb0a 100644
--- a/backends/platform/libretro/dependencies.mk
+++ b/backends/platform/libretro/dependencies.mk
@@ -11,7 +11,7 @@ DEPS_COMMIT_libretro-deps   := c8638d7d317c397c19aa4551038bf648a467ffe6
 
 DEPS_FOLDER_libretro-common := libretro-common
 DEPS_URL_libretro-common    := https://github.com/libretro/libretro-common
-DEPS_COMMIT_libretro-common := 20a43ba79fe6b4ec094b3b20b7bc88f4cfe916fa
+DEPS_COMMIT_libretro-common := d5b04aed7438c559554d3c27a67e3efec559797b
 
 submodule_test  = $(if $(shell result=$$($(SCRIPTS_PATH)/configure_submodules.sh $(DEPS_URL_$(1)) $(DEPS_COMMIT_$(1)) $(DEPS_PATH) $(DEBUG_ALLOW_DIRTY_SUBMODULES) $(DEPS_FOLDER_$(1))) ; { [ -z $$result ] || [ ! $$result = 0 ] ; } && printf error),$(1))
 $(info Configuring submodules...)


Commit: 20ce78d889f4025976467aa9e324c93180e272cd
    https://github.com/scummvm/scummvm/commit/20ce78d889f4025976467aa9e324c93180e272cd
Author: Giovanni Cascione (ing.cascione at gmail.com)
Date: 2023-05-11T20:50:06+02:00

Commit Message:
LIBRETRO: move retroQuit in close_emu_thread loop

Changed paths:
    backends/platform/libretro/src/libretro.cpp


diff --git a/backends/platform/libretro/src/libretro.cpp b/backends/platform/libretro/src/libretro.cpp
index 6aa49f36ed1..06894c3571d 100644
--- a/backends/platform/libretro/src/libretro.cpp
+++ b/backends/platform/libretro/src/libretro.cpp
@@ -371,9 +371,10 @@ static void exit_to_frontend(void) {
 }
 
 static void close_emu_thread(void) {
-	retroQuit();
-	while (!retro_emu_thread_exited())
+	while (!retro_emu_thread_exited()) {
+		retroQuit();
 		retro_switch_to_emu_thread();
+	}
 	retro_deinit_emu_thread();
 }
 


Commit: 3590bb387cf0b0ffe98e85ad78cb61dc71d9547b
    https://github.com/scummvm/scummvm/commit/3590bb387cf0b0ffe98e85ad78cb61dc71d9547b
Author: Giovanni Cascione (ing.cascione at gmail.com)
Date: 2023-05-11T20:50:22+02:00

Commit Message:
LIBRETRO: add osd_notification

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


diff --git a/backends/platform/libretro/src/libretro-os.cpp b/backends/platform/libretro/src/libretro-os.cpp
index dc9a720975b..16398dccb3e 100644
--- a/backends/platform/libretro/src/libretro-os.cpp
+++ b/backends/platform/libretro/src/libretro-os.cpp
@@ -70,6 +70,12 @@
 
 extern retro_log_printf_t log_cb;
 
+extern bool timing_inaccuracies_is_enabled(void);
+extern bool consecutive_screen_updates_is_enabled(void);
+extern void reset_performance_tuner(void);
+extern void retro_osd_notification(const char* msg);
+extern float frame_rate;
+
 #include "common/mutex.h"
 
 /**
@@ -319,11 +325,6 @@ static Common::String s_saveDir;
 
 Common::List<Common::Event> _events;
 
-extern bool timing_inaccuracies_is_enabled(void);
-extern bool consecutive_screen_updates_is_enabled(void);
-extern void reset_performance_tuner(void);
-extern float frame_rate;
-
 class OSystem_RETRO : public EventsBaseBackend, public PaletteManager {
 public:
 	Graphics::Surface _screen;
diff --git a/backends/platform/libretro/src/libretro.cpp b/backends/platform/libretro/src/libretro.cpp
index 06894c3571d..c95fb7bc9db 100644
--- a/backends/platform/libretro/src/libretro.cpp
+++ b/backends/platform/libretro/src/libretro.cpp
@@ -188,14 +188,21 @@ void reset_performance_tuner() {
 	}
 }
 
-static void update_variables(void) {
-	struct retro_variable var;
-
+void retro_osd_notification(const char* msg) {
+	if (!msg || *msg == '\0')
+		return;
 	struct retro_message_ext retro_msg;
 	retro_msg.type = RETRO_MESSAGE_TYPE_NOTIFICATION;
 	retro_msg.target = RETRO_MESSAGE_TARGET_OSD;
 	retro_msg.duration = 3000;
-	retro_msg.msg = "";
+	retro_msg.msg = msg;
+	environ_cb(RETRO_ENVIRONMENT_SET_MESSAGE_EXT, &retro_msg);
+}
+
+static void update_variables(void) {
+	struct retro_variable var;
+
+	const char* osd_msg = "";
 
 	var.key = "scummvm_gamepad_cursor_speed";
 	var.value = NULL;
@@ -288,15 +295,13 @@ static void update_variables(void) {
 	if (!(audio_status & AUDIO_STATUS_BUFFER_SUPPORT)) {
 		if (frameskip_type > 1) {
 			log_cb(RETRO_LOG_WARN, "Selected frameskip mode not available.\n");
-			retro_msg.msg = "Selected frameskip mode not available";
-			environ_cb(RETRO_ENVIRONMENT_SET_MESSAGE_EXT, &retro_msg);
+			retro_osd_notification("Selected frameskip mode not available");
 			frameskip_type = 0;
 		}
 
 		if (performance_switch) {
 			log_cb(RETRO_LOG_WARN, "Auto performance tuner not available.\n");
-			retro_msg.msg = "Auto performance tuner not available";
-			environ_cb(RETRO_ENVIRONMENT_SET_MESSAGE_EXT, &retro_msg);
+			retro_osd_notification("Auto performance tuner not available");
 			performance_switch = 0;
 		}
 	}
@@ -304,8 +309,6 @@ static void update_variables(void) {
 	if (old_frameskip_type != frameskip_type) {
 		audio_status |= AUDIO_STATUS_UPDATE_LATENCY;
 	}
-
-
 }
 
 bool timing_inaccuracies_is_enabled(){
@@ -333,6 +336,8 @@ void parse_command_params(char *cmdline) {
 	int cmdlen = strlen(cmdline);
 	bool quotes = false;
 
+	if (!cmdlen) return;
+
 	/* Append a new line to the end of the command to signify it's finished. */
 	cmdline[cmdlen] = '\n';
 	cmdline[++cmdlen] = '\0';
@@ -616,15 +621,9 @@ bool retro_load_game(const struct retro_game_info *game) {
 		Common::FSNode detect_target = Common::FSNode(game->path);
 		Common::FSNode parent_dir = detect_target.getParent();
 		char target_id[400] = {0};
-		char buffer[400];
+		char buffer[400] = {0};
 		int test_game_status = TEST_GAME_KO_NOT_FOUND;
 
-		struct retro_message_ext retro_msg;
-		retro_msg.type = RETRO_MESSAGE_TYPE_NOTIFICATION;
-		retro_msg.target = RETRO_MESSAGE_TARGET_OSD;
-		retro_msg.duration = 3000;
-		retro_msg.msg = "";
-
 		const char *target_file_ext = ".scummvm";
 		int target_file_ext_pos = strlen(game->path) - strlen(target_file_ext);
 
@@ -685,19 +684,15 @@ bool retro_load_game(const struct retro_game_info *game) {
 			break;
 		case TEST_GAME_KO_MULTIPLE_RESULTS:
 			log_cb(RETRO_LOG_WARN, "[scummvm] Multiple targets found for '%s' in scummvm.ini\n", target_id);
-			retro_msg.msg = "Multiple targets found";
+			retro_osd_notification("Multiple targets found");
 			break;
 		case TEST_GAME_KO_NOT_FOUND:
 		default:
 			log_cb(RETRO_LOG_WARN, "[scummvm] Game not found. Check path and content of '%s'\n", game->path);
-			retro_msg.msg = "Game not found";
+			retro_osd_notification("Game not found");
 		}
 
-		if (retro_msg.msg[0] != '\0') {
-			environ_cb(RETRO_ENVIRONMENT_SET_MESSAGE_EXT, &retro_msg);
-		} else {
-			parse_command_params(buffer);
-		}
+		parse_command_params(buffer);
 	} else {
 		game_buf_ptr = NULL;
 	}


Commit: 2e98da4e9e6f7cb5e645b816fc9e02d37d13a546
    https://github.com/scummvm/scummvm/commit/2e98da4e9e6f7cb5e645b816fc9e02d37d13a546
Author: Giovanni Cascione (ing.cascione at gmail.com)
Date: 2023-05-11T20:50:35+02:00

Commit Message:
LIBRETRO: add core path as fallback for system and save folders

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


diff --git a/backends/platform/libretro/src/libretro-os.cpp b/backends/platform/libretro/src/libretro-os.cpp
index 16398dccb3e..28042987f70 100644
--- a/backends/platform/libretro/src/libretro-os.cpp
+++ b/backends/platform/libretro/src/libretro-os.cpp
@@ -1320,11 +1320,11 @@ int retroTestGame(const char *game_id, bool autodetect) {
 }
 
 void retroSetSystemDir(const char *aPath) {
-	s_systemDir = Common::String(aPath ? aPath : ".");
+	s_systemDir = Common::String(aPath);
 }
 
 void retroSetSaveDir(const char *aPath) {
-	s_saveDir = Common::String(aPath ? aPath : ".");
+	s_saveDir = Common::String(aPath);
 }
 
 void retroKeyEvent(bool down, unsigned keycode, uint32_t character, uint16_t key_modifiers) {
diff --git a/backends/platform/libretro/src/libretro.cpp b/backends/platform/libretro/src/libretro.cpp
index c95fb7bc9db..0c5f06df4f2 100644
--- a/backends/platform/libretro/src/libretro.cpp
+++ b/backends/platform/libretro/src/libretro.cpp
@@ -492,6 +492,7 @@ void retro_get_system_av_info(struct retro_system_av_info *info) {
 void retro_init(void) {
 	const char *sysdir;
 	const char *savedir;
+	const char *coredir;
 
 	struct retro_log_callback log;
 	if (environ_cb(RETRO_ENVIRONMENT_GET_LOG_INTERFACE, &log))
@@ -558,12 +559,15 @@ void retro_init(void) {
 	retro_keyboard_callback cb = {retroKeyEvent};
 	environ_cb(RETRO_ENVIRONMENT_SET_KEYBOARD_CALLBACK, &cb);
 
+	if (! environ_cb(RETRO_ENVIRONMENT_GET_LIBRETRO_PATH, &coredir))
+		coredir = ".";
+
 	if (environ_cb(RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY, &sysdir))
 		retroSetSystemDir(sysdir);
 	else {
 		if (log_cb)
 			log_cb(RETRO_LOG_WARN, "No System directory specified, using current directory.\n");
-		retroSetSystemDir(".");
+		retroSetSystemDir(coredir);
 	}
 
 	if (environ_cb(RETRO_ENVIRONMENT_GET_SAVE_DIRECTORY, &savedir))
@@ -571,7 +575,7 @@ void retro_init(void) {
 	else {
 		if (log_cb)
 			log_cb(RETRO_LOG_WARN, "No Save directory specified, using current directory.\n");
-		retroSetSaveDir(".");
+		retroSetSaveDir(coredir);
 	}
 
 	g_system = retroBuildOS();


Commit: a062f06bd11a0104eb1af9a0bdbd4132c2abf7e4
    https://github.com/scummvm/scummvm/commit/a062f06bd11a0104eb1af9a0bdbd4132c2abf7e4
Author: Giovanni Cascione (ing.cascione at gmail.com)
Date: 2023-05-11T20:50:48+02:00

Commit Message:
LIBRETRO: add auto setup for extra/theme folders

Changed paths:
    backends/platform/libretro/Makefile.common
    backends/platform/libretro/include/os.h
    backends/platform/libretro/scripts/bundle_datafiles.sh
    backends/platform/libretro/src/libretro-os.cpp
    backends/platform/libretro/src/libretro.cpp


diff --git a/backends/platform/libretro/Makefile.common b/backends/platform/libretro/Makefile.common
index 398c089d15a..ce6db4af520 100644
--- a/backends/platform/libretro/Makefile.common
+++ b/backends/platform/libretro/Makefile.common
@@ -83,10 +83,14 @@ endif
 CORE_NAME = "ScummVM"
 # Pipe separated allowed file extensions that core can handle
 CORE_EXTENSIONS = "scummvm"
+# Subdirs for datafiles bundle
+SCUMMVM_SYSTEM_SUBDIR  := scummvm
+SCUMMVM_EXTRA_SUBDIR   := extra
+SCUMMVM_THEME_SUBDIR   := theme
 
 INCLUDES += -I$(SCUMMVM_PATH)
 DEFINES  += -D__LIBRETRO__ -DNONSTANDARD_PORT -DUSE_RGB_COLOR -DUSE_OSD -DFRONTEND_SUPPORTS_RGB565 -DUSE_TRANSLATION -DDETECTION_STATIC -DHAVE_CONFIG_H -DUSE_BINK -DUSE_LUA -DUSE_TINYGL -DENABLE_VKEYBD
-DEFINES  += -DCORE_NAME=\"$(CORE_NAME)\" -DCORE_EXTENSIONS=\"$(CORE_EXTENSIONS)\"
+DEFINES  += -DCORE_NAME=\"$(CORE_NAME)\" -DCORE_EXTENSIONS=\"$(CORE_EXTENSIONS)\" -DSCUMMVM_SYSTEM_SUBDIR=\"$(SCUMMVM_SYSTEM_SUBDIR)\" -DSCUMMVM_EXTRA_SUBDIR=\"$(SCUMMVM_EXTRA_SUBDIR)\" -DSCUMMVM_THEME_SUBDIR=\"$(SCUMMVM_THEME_SUBDIR)\"
 CXXFLAGS += -Wno-long-long -Wno-multichar -Wno-unknown-pragmas -Wno-reorder -Wno-undefined-var-template
 
 ifeq ($(USE_LIBCO), 1)
@@ -207,6 +211,6 @@ endif
 
 $(TARGET_NAME)_libretro.info: $(SCUMMVM_PATH)/dists/scummvm.rc
 	@echo Preparing $@
-	@$(SCRIPTS_PATH)/bundle_datafiles.sh $(ROOT_PATH) $(SCUMMVM_PATH) info $(TARGET_NAME) $(CORE_NAME) $(CORE_EXTENSIONS)
+	@$(SCRIPTS_PATH)/bundle_datafiles.sh $(ROOT_PATH) $(SCUMMVM_PATH) info $(TARGET_NAME) $(CORE_NAME) $(CORE_EXTENSIONS) $(SCUMMVM_SYSTEM_SUBDIR) $(SCUMMVM_EXTRA_SUBDIR) $(SCUMMVM_THEME_SUBDIR)
 
 .PHONY: all core datafiles coreinfo
diff --git a/backends/platform/libretro/include/os.h b/backends/platform/libretro/include/os.h
index ded1a7c1e8f..821af1436c7 100644
--- a/backends/platform/libretro/include/os.h
+++ b/backends/platform/libretro/include/os.h
@@ -88,9 +88,6 @@ void retroQuit(void);
 void retroReset(void);
 int retroTestGame(const char *game_id, bool autodetect);
 
-void retroSetSystemDir(const char *aPath);
-void retroSetSaveDir(const char *aPath);
-
 void retroKeyEvent(bool down, unsigned keycode, uint32_t character, uint16_t key_modifiers);
 
 uint8 getThreadSwitchCaller(void);
diff --git a/backends/platform/libretro/scripts/bundle_datafiles.sh b/backends/platform/libretro/scripts/bundle_datafiles.sh
index 8d5ec3b912a..1cbaed359da 100755
--- a/backends/platform/libretro/scripts/bundle_datafiles.sh
+++ b/backends/platform/libretro/scripts/bundle_datafiles.sh
@@ -46,6 +46,9 @@ function process_group(){
 # $4 [OPT] target name (prefix for core info file)
 # $5 [OPT] displayed core name (shown in frontend)
 # $6 [OPT] allowed extensions - backup if ScummVM.dat is not available
+# $7 [OPT] target scummvm folder name in frontend system folder
+# $8 [OPT] target extra folder name in scummvm system folder
+# $9 [OPT] target theme folder name in scummvm system folder
 
 # Exit if in parameters are not provided
 if [ -z $1 ] || [ -z $2 ] || [ -z $3 ] ; then
@@ -55,15 +58,15 @@ fi
 [ -z $4 ] && INFO_FILE_PRE=scummvm || INFO_FILE_PRE=$4
 [ -z $5 ] && NICE_NAME=ScummVM || NICE_NAME=$5
 [ -z $6 ] && ALLOWED_EXT=scummvm || ALLOWED_EXT=$6
+[ -z $7 ] && BUNDLE_DIR=scummvm || BUNDLE_DIR="$7"
+[ -z $8 ] && BUNDLE_DATAFILES_DIR="${BUNDLE_DIR}/extra" || BUNDLE_DATAFILES_DIR="${BUNDLE_DIR}/$8"
+[ -z $9 ] && BUNDLE_THEME_DIR="${BUNDLE_DIR}/theme" || BUNDLE_THEME_DIR="${BUNDLE_DIR}/$9"
 
 # Set variables
 BUILD_PATH="$1"
 SCUMMVM_PATH="$2"
 TMP_PATH="${BUILD_PATH}/tmp_data"
 TARGET_PATH="${BUILD_PATH}"
-BUNDLE_DIR="scummvm"
-BUNDLE_DATAFILES_DIR="${BUNDLE_DIR}/extra"
-BUNDLE_THEME_DIR="${BUNDLE_DIR}/theme"
 BUNDLE_ZIP_FILE="${BUNDLE_DIR}.zip"
 BUNDLE_LOCAL_DATAFILES_DIR="${BUILD_PATH}/dist"
 
diff --git a/backends/platform/libretro/src/libretro-os.cpp b/backends/platform/libretro/src/libretro-os.cpp
index 28042987f70..adba7202528 100644
--- a/backends/platform/libretro/src/libretro-os.cpp
+++ b/backends/platform/libretro/src/libretro-os.cpp
@@ -75,6 +75,8 @@ extern bool consecutive_screen_updates_is_enabled(void);
 extern void reset_performance_tuner(void);
 extern void retro_osd_notification(const char* msg);
 extern float frame_rate;
+extern const char * retro_get_system_dir(void);
+extern const char * retro_get_save_dir(void);
 
 #include "common/mutex.h"
 
@@ -292,6 +294,9 @@ static INLINE void copyRectToSurface(uint8_t *pixels, int out_pitch, const uint8
 
 static Common::String s_systemDir;
 static Common::String s_saveDir;
+static Common::String s_extraDir;
+static Common::String s_themeDir;
+static Common::String s_lastDir;
 
 #ifdef FRONTEND_SUPPORTS_RGB565
 #define SURF_BPP 2
@@ -372,13 +377,13 @@ public:
 		memset(_joypadmouseButtons, 0, sizeof(_joypadmouseButtons));
 		memset(_joypadkeyboardButtons, 0, sizeof(_joypadkeyboardButtons));
 
-		_startTime = getMillis();
-
-		if (s_systemDir.empty())
-			s_systemDir = ".";
+		s_systemDir = Common::String(retro_get_system_dir());
+		s_saveDir = Common::String(retro_get_save_dir());
+		s_themeDir = s_systemDir + "/" + SCUMMVM_SYSTEM_SUBDIR + "/" + SCUMMVM_THEME_SUBDIR;
+		s_extraDir = s_systemDir + "/" + SCUMMVM_SYSTEM_SUBDIR + "/" + SCUMMVM_EXTRA_SUBDIR;
+		s_lastDir = s_systemDir;
 
-		if (s_saveDir.empty())
-			s_saveDir = ".";
+		_startTime = getMillis();
 	}
 
 	virtual ~OSystem_RETRO() {
@@ -391,7 +396,26 @@ public:
 	}
 
 	virtual void initBackend() {
+
 		_savefileManager = new DefaultSaveFileManager(s_saveDir);
+
+		if (! ConfMan.hasKey("themepath")) {
+			if (! Common::FSNode(s_themeDir).exists())
+				retro_osd_notification("ScummVM theme folder not found.");
+			else
+				ConfMan.set("themepath", s_themeDir);
+		}
+
+		if (! ConfMan.hasKey("extrapath")) {
+			if (! Common::FSNode(s_extraDir).exists())
+				retro_osd_notification("ScummVM datafiles folder not found. Some engines/features will not work.");
+			else
+				ConfMan.set("extrapath", s_extraDir);
+		}
+
+		if (! ConfMan.hasKey("browser_lastpath"))
+			ConfMan.set("browser_lastpath", s_lastDir);
+
 #ifdef FRONTEND_SUPPORTS_RGB565
 		_overlay.create(RES_W_OVERLAY, RES_H_OVERLAY, Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0));
 #else
@@ -1319,14 +1343,6 @@ int retroTestGame(const char *game_id, bool autodetect) {
 	return dynamic_cast<OSystem_RETRO *>(g_system)->TestGame(game_id, autodetect);
 }
 
-void retroSetSystemDir(const char *aPath) {
-	s_systemDir = Common::String(aPath);
-}
-
-void retroSetSaveDir(const char *aPath) {
-	s_saveDir = Common::String(aPath);
-}
-
 void retroKeyEvent(bool down, unsigned keycode, uint32_t character, uint16_t key_modifiers) {
 	dynamic_cast<OSystem_RETRO *>(g_system)->processKeyEvent(down, keycode, character, key_modifiers);
 }
diff --git a/backends/platform/libretro/src/libretro.cpp b/backends/platform/libretro/src/libretro.cpp
index 0c5f06df4f2..f8f4070e5d7 100644
--- a/backends/platform/libretro/src/libretro.cpp
+++ b/backends/platform/libretro/src/libretro.cpp
@@ -489,11 +489,38 @@ void retro_get_system_av_info(struct retro_system_av_info *info) {
 	info->timing.sample_rate = SAMPLE_RATE;
 }
 
-void retro_init(void) {
+const char * retro_get_system_dir(void){
 	const char *sysdir;
+	const char *coredir;
+
+	if (environ_cb(RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY, &sysdir))
+		return sysdir;
+	else {
+		if (log_cb)
+			log_cb(RETRO_LOG_WARN, "No System directory specified, using current directory.\n");
+		if (! environ_cb(RETRO_ENVIRONMENT_GET_LIBRETRO_PATH, &coredir))
+			coredir = ".";
+		return coredir;
+	}
+}
+
+const char * retro_get_save_dir(void){
 	const char *savedir;
 	const char *coredir;
 
+
+	if (environ_cb(RETRO_ENVIRONMENT_GET_SAVE_DIRECTORY, &savedir))
+		return savedir;
+	else {
+		if (log_cb)
+			log_cb(RETRO_LOG_WARN, "No Save directory specified, using current directory.\n");
+		if (! environ_cb(RETRO_ENVIRONMENT_GET_LIBRETRO_PATH, &coredir))
+			coredir = ".";
+		return coredir;
+	}
+}
+
+void retro_init(void) {
 	struct retro_log_callback log;
 	if (environ_cb(RETRO_ENVIRONMENT_GET_LOG_INTERFACE, &log))
 		log_cb = log.log;
@@ -559,25 +586,6 @@ void retro_init(void) {
 	retro_keyboard_callback cb = {retroKeyEvent};
 	environ_cb(RETRO_ENVIRONMENT_SET_KEYBOARD_CALLBACK, &cb);
 
-	if (! environ_cb(RETRO_ENVIRONMENT_GET_LIBRETRO_PATH, &coredir))
-		coredir = ".";
-
-	if (environ_cb(RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY, &sysdir))
-		retroSetSystemDir(sysdir);
-	else {
-		if (log_cb)
-			log_cb(RETRO_LOG_WARN, "No System directory specified, using current directory.\n");
-		retroSetSystemDir(coredir);
-	}
-
-	if (environ_cb(RETRO_ENVIRONMENT_GET_SAVE_DIRECTORY, &savedir))
-		retroSetSaveDir(savedir);
-	else {
-		if (log_cb)
-			log_cb(RETRO_LOG_WARN, "No Save directory specified, using current directory.\n");
-		retroSetSaveDir(coredir);
-	}
-
 	g_system = retroBuildOS();
 }
 




More information about the Scummvm-git-logs mailing list