From patchwork Fri Jan 17 04:45:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 37096 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 63F0927BBEA; Fri, 17 Jan 2025 04:47:30 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BC63227BBE9 for ; Fri, 17 Jan 2025 04:47:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tYeG9-0005Ik-RM; Thu, 16 Jan 2025 23:47:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tYeG8-0005IX-BQ for guix-patches@gnu.org; Thu, 16 Jan 2025 23:47:04 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tYeG7-0004z1-RX for guix-patches@gnu.org; Thu, 16 Jan 2025 23:47:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=6t4kuXyClQKJze4eGAb6xDSpbwyhGjhKCNkgPG0AL9M=; b=pPCnqF8SRD8ZpS8CmjbZR6wrFjq7qAg7xujiaRikhJam8Lt28tBFD/+STBiqwyWbdu0rlNrFDDDsQJHeGMKvm39xWEYW6JXgv4s6U1TTiKgv8JXS5ii5wAd4ko/LiQSjH+rgVxTagtg8nYjneIAW4WjgEYslndiJr+CB1oG7RimgsRu6WvZFX2xIy9Ver2G5bucRgwit+mzjys1+0SOgy/DHr2rsQtNEehWncsnUsqIQ3NBaFLZUQ2AsYr/Zk4mof4jB1KprUCj5NjiUUBvyDnZkorInQl8Cr9EJOohF8AmRPgokJgrONe6uVogMUrWYvjz8V3yOnJ09hu3Qi/QL2A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tYeG7-0001So-L3; Thu, 16 Jan 2025 23:47:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75619] [PATCH 4/7] gnu: retroarch-minimal: Add search path for LIBRETRO_SYSTEM_DIRECTORY. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: adam.faiz@disroot.org, liliana.prikler@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Fri, 17 Jan 2025 04:47:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75619 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75619@debbugs.gnu.org Cc: Maxim Cournoyer , Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 75619-submit@debbugs.gnu.org id=B75619.17370892225602 (code B ref 75619); Fri, 17 Jan 2025 04:47:03 +0000 Received: (at 75619) by debbugs.gnu.org; 17 Jan 2025 04:47:02 +0000 Received: from localhost ([127.0.0.1]:35603 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tYeG5-0001SC-2W for submit@debbugs.gnu.org; Thu, 16 Jan 2025 23:47:01 -0500 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]:47469) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tYeG2-0001Rs-IY for 75619@debbugs.gnu.org; Thu, 16 Jan 2025 23:46:59 -0500 Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-21a7ed0155cso25779215ad.3 for <75619@debbugs.gnu.org>; Thu, 16 Jan 2025 20:46:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737089212; x=1737694012; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6t4kuXyClQKJze4eGAb6xDSpbwyhGjhKCNkgPG0AL9M=; b=QahpLWGxevTRnBEEqS/rtzeK0IcQ32g1puB3y0vbNeYg3vI5M61msID56V4HIcuTLD 2acAWJouRMFZ4GHvKV+gHpHr0fgdSjZOhecxxJlpqiCG0O+2ZilmsX3nNW3iKE2HsVki zPk7acxjpXPd9taX5PqFOBlYHC7PKI/+XWdrry7I/1kqLjSLgNH3ySkGGI06pYmmkylG H0ZM1d6vRtjNUnNTrDO/7UgLQAEbgBMHI+9qr61ckc2zD/eXmLl6nEveUbdsm2MtDwGg Eh2DigAjhPaRPD5sJb3QaC7Xg3SB0J8oRP3vVWxYlV+OVbE7WkvsLLVxR76Mco9tWr7n oFzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737089212; x=1737694012; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6t4kuXyClQKJze4eGAb6xDSpbwyhGjhKCNkgPG0AL9M=; b=QhaEHaZ4FMrcwYyChgAD1J2Lv0kFSGAblbIPfUx7UhU9pELFcTpAI/d2Fdc5zAKqyd edJ8/QzLSK1P5nXr1TprMJVsmYj9GoQnTxWMPAmwfPcejmIKDqjNdlP8tfRjG3FItqwf n917HjQsTCO1fnIrNIg2zV8emTJo3wjpGq8r1caUmDg2WZa6Jl4H6izGYbwFC7b/ktrK 2vL4fpqJRBkQhk+J79Ztj1EWz0nynE5XUzi27iIR6cTDYQXgbNzYnEuvlu17neEhcToQ FtvS98nylMorQqOVHLnVh2AHbPgCY8BwXAsYrOzWieL/nRvyA8Nl3OAkMgafOT2GlL9R 8eGA== X-Gm-Message-State: AOJu0Yxa1OsKRZdbzbwQhQcXo6bXcL5+GEAG3fudcKn9lStvKC6axvva dDUVm4OOrzTham9lBSOlkCtB17jvDWWur5Hty/WsS7EYke5wS0xRziWUuu8G X-Gm-Gg: ASbGncvt3C/IVllecjMwVP+ewtP/ClC1bkEYekYqLcPz72FcrVTesN8aesKOgphnMKO tQjhSJQ7IHvr7UxtZ6Elen8NHirc86VYmXHvV+WU1W5pUSyTeK/XQeZV5j6p8Is8M4r9pS5zMeK 5wfC4TGFFwjtdWFfBD3ttWc6KMvlphu+LUawdYhnrgfFsxmkUlxvriL8gneAEGXuycUY9kFTNAz a7Ml5O0i5qNckBNTZC59VeddVjIeAJYRIEgWRJuOwqv0xq8f70cSQNxUiT1fjUzRGiUJFeKqB0= X-Google-Smtp-Source: AGHT+IFhcjEB7r/+5OtzaQcW75PyKJg186wpkO5DkQCSCcr2sgx9NGKtInzIyL7YWB3ihdWl0W2Iiw== X-Received: by 2002:a05:6a20:394a:b0:1db:de38:294b with SMTP id adf61e73a8af0-1eb215fb30fmr2321371637.38.1737089212026; Thu, 16 Jan 2025 20:46:52 -0800 (PST) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-a9bdf57de17sm863935a12.77.2025.01.16.20.46.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jan 2025 20:46:51 -0800 (PST) From: Maxim Cournoyer Date: Fri, 17 Jan 2025 13:45:54 +0900 Message-ID: X-Mailer: git-send-email 2.47.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches This makes it possible to locate system files provided by libretro cores. * gnu/packages/patches/retroarch-improved-search-paths.patch: Extend patch. * gnu/packages/emulators.scm (retroarch-minimal) [native-search-paths]: Register new search path for the LIBRETRO_SYSTEM_DIRECTORY variable. Change-Id: I48f9a92608c0e36922ce9dcc9bbb61d6ca915002 --- gnu/packages/emulators.scm | 4 + .../retroarch-improved-search-paths.patch | 88 ++++++++++++++----- 2 files changed, 68 insertions(+), 24 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 2486485805..08af04ccfe 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -2632,6 +2632,10 @@ (define-public retroarch-minimal (variable "LIBRETRO_AUTOCONFIG_DIRECTORY") (separator #f) ;single entry (files '("share/libretro/autoconfig"))) + (search-path-specification + (variable "LIBRETRO_SYSTEM_DIRECTORY") + (separator #f) ;single entry + (files '("share/libretro/system"))) (search-path-specification (variable "LIBRETRO_VIDEO_FILTER_DIRECTORY") (separator #f) ;single entry diff --git a/gnu/packages/patches/retroarch-improved-search-paths.patch b/gnu/packages/patches/retroarch-improved-search-paths.patch index 6fcd4745ac..8d70514bd8 100644 --- a/gnu/packages/patches/retroarch-improved-search-paths.patch +++ b/gnu/packages/patches/retroarch-improved-search-paths.patch @@ -4,22 +4,23 @@ variable. Upstream-status: https://github.com/libretro/RetroArch/pull/17054 diff --git a/configuration.c b/configuration.c -index 5808a3f21c..0cc2909102 100644 +index 5808a3f21c..2bc9abf11c 100644 --- a/configuration.c +++ b/configuration.c -@@ -3573,6 +3573,11 @@ static bool config_load_file(global_t *global, +@@ -3573,6 +3573,12 @@ static bool config_load_file(global_t *global, { unsigned i; char tmp_str[PATH_MAX_LENGTH]; + char* libretro_directory = NULL; + char* libretro_assets_directory = NULL; + char* libretro_autoconfig_directory = NULL; ++ char* libretro_system_directory = NULL; + char* libretro_video_filter_directory = NULL; + char* libretro_video_shader_directory = NULL; static bool first_load = true; bool without_overrides = false; unsigned msg_color = 0; -@@ -3848,12 +3853,6 @@ static bool config_load_file(global_t *global, +@@ -3848,12 +3854,6 @@ static bool config_load_file(global_t *global, strlcpy(path_settings[i].ptr, tmp_str, PATH_MAX_LENGTH); } @@ -32,7 +33,7 @@ index 5808a3f21c..0cc2909102 100644 #ifdef RARCH_CONSOLE if (conf) video_driver_load_settings(global, conf); -@@ -3861,6 +3860,20 @@ static bool config_load_file(global_t *global, +@@ -3861,6 +3861,26 @@ static bool config_load_file(global_t *global, /* Post-settings load */ @@ -49,11 +50,17 @@ index 5808a3f21c..0cc2909102 100644 + configuration_set_string(settings, + settings->paths.directory_autoconfig, + libretro_autoconfig_directory); ++ ++ libretro_system_directory = getenv("LIBRETRO_SYSTEM_DIRECTORY"); ++ if (libretro_system_directory) ++ configuration_set_string(settings, ++ settings->paths.directory_system, ++ libretro_system_directory); + if ( (rarch_flags & RARCH_FLAGS_HAS_SET_USERNAME) && (override_username)) { -@@ -4032,15 +4045,27 @@ static bool config_load_file(global_t *global, +@@ -4032,15 +4052,27 @@ static bool config_load_file(global_t *global, *settings->paths.path_menu_wallpaper = '\0'; if (string_is_equal(settings->paths.path_rgui_theme_preset, "default")) *settings->paths.path_rgui_theme_preset = '\0'; @@ -85,18 +92,18 @@ index 5808a3f21c..0cc2909102 100644 #ifdef _3DS if (string_is_equal(settings->paths.directory_bottom_assets, "default")) diff --git a/docs/retroarch.6 b/docs/retroarch.6 -index 7478040e17..f864e0e0d5 100644 +index 7478040e17..bc1ac8dfff 100644 --- a/docs/retroarch.6 +++ b/docs/retroarch.6 @@ -1,6 +1,6 @@ .\" retroarch.6: -.TH "RETROARCH" "6" "November 1, 2011" "RETROARCH" "System Manager's Manual: retroarch" -+.TH "RETROARCH" "6" "September 28, 2024" "RETROARCH" "System Manager's Manual: retroarch" ++.TH "RETROARCH" "6" "January 16, 2025" "RETROARCH" "System Manager's Manual: retroarch" .SH NAME -@@ -239,3 +239,36 @@ Disables all kinds of content patching. +@@ -239,3 +239,42 @@ Disables all kinds of content patching. .TP \fB-D, --detach\fR Detach from the current console. This is currently only relevant for Microsoft Windows. @@ -123,6 +130,12 @@ index 7478040e17..f864e0e0d5 100644 +"joypad_autoconfig_dir" configuration file option. + +.TP ++\fBLIBRETRO_SYSTEM_DIRECTORY\fR ++Specify the directory where RetroArch looks for system files, ++overriding the value of the "system_directory" configuration file ++option. ++ ++.TP +\fBLIBRETRO_VIDEO_FILTER_DIRECTORY\fR +Specify the directory where RetroArch looks for video filters, +overriding the value of the "video_filter_dir" configuration file @@ -134,21 +147,22 @@ index 7478040e17..f864e0e0d5 100644 +overriding the value of the "video_shader_dir" configuration file +option. diff --git a/frontend/drivers/platform_unix.c b/frontend/drivers/platform_unix.c -index c157d355a1..ddf0b5ca87 100644 +index c157d355a1..a8e957c7c2 100644 --- a/frontend/drivers/platform_unix.c +++ b/frontend/drivers/platform_unix.c -@@ -1324,6 +1324,10 @@ static void frontend_unix_get_env(int *argc, +@@ -1324,6 +1324,11 @@ static void frontend_unix_get_env(int *argc, { unsigned i; const char* libretro_directory = getenv("LIBRETRO_DIRECTORY"); + const char* libretro_assets_directory = getenv("LIBRETRO_ASSETS_DIRECTORY"); + const char* libretro_autoconfig_directory = getenv("LIBRETRO_AUTOCONFIG_DIRECTORY"); ++ const char* libretro_system_directory = getenv("LIBRETRO_SYSTEM_DIRECTORY"); + const char* libretro_video_filter_directory = getenv("LIBRETRO_VIDEO_FILTER_DIRECTORY"); + const char* libretro_video_shader_directory = getenv("LIBRETRO_VIDEO_SHADER_DIRECTORY"); #ifdef ANDROID int32_t major, minor, rel; char device_model[PROP_VALUE_MAX] = {0}; -@@ -1765,12 +1769,20 @@ static void frontend_unix_get_env(int *argc, +@@ -1765,12 +1770,20 @@ static void frontend_unix_get_env(int *argc, "cores", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_INFO])); else #endif @@ -174,7 +188,7 @@ index c157d355a1..ddf0b5ca87 100644 #ifdef ASSETS_DIR if (path_is_directory(ASSETS_DIR "/assets")) fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_ASSETS], -@@ -1778,7 +1790,10 @@ static void frontend_unix_get_env(int *argc, +@@ -1778,7 +1791,10 @@ static void frontend_unix_get_env(int *argc, "assets", sizeof(g_defaults.dirs[DEFAULT_DIR_ASSETS])); else #endif @@ -186,7 +200,7 @@ index c157d355a1..ddf0b5ca87 100644 fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_ASSETS], "/usr/local/share/retroarch", "assets", sizeof(g_defaults.dirs[DEFAULT_DIR_ASSETS])); -@@ -1838,7 +1853,11 @@ static void frontend_unix_get_env(int *argc, +@@ -1838,7 +1854,11 @@ static void frontend_unix_get_env(int *argc, "filters/video", sizeof(g_defaults.dirs[DEFAULT_DIR_VIDEO_FILTER])); else #endif @@ -199,7 +213,7 @@ index c157d355a1..ddf0b5ca87 100644 fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_VIDEO_FILTER], "/usr/local/share/retroarch", "filters/video", sizeof(g_defaults.dirs[DEFAULT_DIR_VIDEO_FILTER])); -@@ -1872,8 +1891,13 @@ static void frontend_unix_get_env(int *argc, +@@ -1872,8 +1892,13 @@ static void frontend_unix_get_env(int *argc, "records", sizeof(g_defaults.dirs[DEFAULT_DIR_RECORD_OUTPUT])); fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_DATABASE], base_path, "database/rdb", sizeof(g_defaults.dirs[DEFAULT_DIR_DATABASE])); @@ -215,16 +229,33 @@ index c157d355a1..ddf0b5ca87 100644 fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CHEATS], base_path, "cheats", sizeof(g_defaults.dirs[DEFAULT_DIR_CHEATS])); fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_OVERLAY], base_path, +@@ -1892,8 +1917,13 @@ static void frontend_unix_get_env(int *argc, + "saves", sizeof(g_defaults.dirs[DEFAULT_DIR_SRAM])); + fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SAVESTATE], base_path, + "states", sizeof(g_defaults.dirs[DEFAULT_DIR_SAVESTATE])); +- fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SYSTEM], base_path, +- "system", sizeof(g_defaults.dirs[DEFAULT_DIR_SYSTEM])); ++ if (!string_is_empty(libretro_system_directory)) ++ strlcpy(g_defaults.dirs[DEFAULT_DIR_SYSTEM], ++ libretro_system_directory, ++ sizeof(g_defaults.dirs[DEFAULT_DIR_SYSTEM])); ++ else ++ fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SYSTEM], base_path, ++ "system", sizeof(g_defaults.dirs[DEFAULT_DIR_SYSTEM])); + #endif + + #ifndef IS_SALAMANDER diff --git a/frontend/drivers/platform_win32.c b/frontend/drivers/platform_win32.c -index 26ed25c04f..0cc9a9dc95 100644 +index a1e5a93a32..0a51bc8df6 100644 --- a/frontend/drivers/platform_win32.c +++ b/frontend/drivers/platform_win32.c -@@ -565,24 +565,38 @@ static void frontend_win32_env_get(int *argc, char *argv[], +@@ -565,18 +565,33 @@ static void frontend_win32_env_get(int *argc, char *argv[], { const char *tmp_dir = getenv("TMP"); const char *libretro_directory = getenv("LIBRETRO_DIRECTORY"); + const char *libretro_assets_directory = getenv("LIBRETRO_ASSETS_DIRECTORY"); + const char* libretro_autoconfig_directory = getenv("LIBRETRO_AUTOCONFIG_DIRECTORY"); ++ const char* libretro_system_directory = getenv("LIBRETRO_SYSTEM_DIRECTORY"); + const char* libretro_video_filter_directory = getenv("LIBRETRO_VIDEO_FILTER_DIRECTORY"); + const char* libretro_video_shader_directory = getenv("LIBRETRO_VIDEO_SHADER_DIRECTORY"); if (!string_is_empty(tmp_dir)) @@ -256,14 +287,7 @@ index 26ed25c04f..0cc9a9dc95 100644 fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_CHEATS], ":\\cheats", sizeof(g_defaults.dirs[DEFAULT_DIR_CHEATS])); fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_DATABASE], - ":\\database\\rdb", sizeof(g_defaults.dirs[DEFAULT_DIR_DATABASE])); - fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_PLAYLIST], -- ":\\playlists", sizeof(g_defaults.dirs[DEFAULT_DIR_ASSETS])); -+ ":\\playlists", sizeof(g_defaults.dirs[DEFAULT_DIR_PLAYLIST])); - fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_RECORD_CONFIG], - ":\\config\\record", sizeof(g_defaults.dirs[DEFAULT_DIR_RECORD_CONFIG])); - fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_RECORD_OUTPUT], -@@ -605,12 +619,26 @@ static void frontend_win32_env_get(int *argc, char *argv[], +@@ -605,12 +620,26 @@ static void frontend_win32_env_get(int *argc, char *argv[], else fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_CORE], ":\\cores", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE])); @@ -296,3 +320,19 @@ index 26ed25c04f..0cc9a9dc95 100644 fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_CORE_ASSETS], ":\\downloads", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_ASSETS])); fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_SCREENSHOT], +@@ -619,8 +648,13 @@ static void frontend_win32_env_get(int *argc, char *argv[], + ":\\saves", sizeof(g_defaults.dirs[DEFAULT_DIR_SRAM])); + fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_SAVESTATE], + ":\\states", sizeof(g_defaults.dirs[DEFAULT_DIR_SAVESTATE])); +- fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_SYSTEM], +- ":\\system", sizeof(g_defaults.dirs[DEFAULT_DIR_SYSTEM])); ++ if (!string_is_empty(libretro_system_directory)) ++ strlcpy(g_defaults.dirs[DEFAULT_DIR_SYSTEM], ++ libretro_system_directory, ++ sizeof(g_defaults.dirs[DEFAULT_DIR_SYSTEM])); ++ else ++ fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_SYSTEM], ++ ":\\system", sizeof(g_defaults.dirs[DEFAULT_DIR_SYSTEM])); + fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_LOGS], + ":\\logs", sizeof(g_defaults.dirs[DEFAULT_DIR_LOGS])); +