mirror of
https://github.com/86Box/86Box.git
synced 2026-02-22 09:35:32 -07:00
The forgotten local asset paths and fix the QT asset paths again.
This commit is contained in:
@@ -1025,6 +1025,15 @@ usage:
|
||||
rom_add_path(temp);
|
||||
|
||||
plat_init_rom_paths();
|
||||
|
||||
// Add the VM-local asset path.
|
||||
path_append_filename(temp, usr_path, "assets");
|
||||
asset_add_path(temp);
|
||||
|
||||
// Add the standard ROM path in the same directory as the executable.
|
||||
path_append_filename(temp, exe_path, "assets");
|
||||
asset_add_path(temp);
|
||||
|
||||
plat_init_asset_paths();
|
||||
|
||||
/*
|
||||
|
||||
@@ -852,10 +852,10 @@ plat_init_asset_paths(void)
|
||||
|
||||
for (auto &path : paths) {
|
||||
#ifdef __APPLE__
|
||||
asset_add_path(QDir(path).filePath("net.86Box.86Box/asset").toUtf8().constData());
|
||||
asset_add_path(QDir(path).filePath("86Box/asset").toUtf8().constData());
|
||||
asset_add_path(QDir(path).filePath("net.86Box.86Box/assets").toUtf8().constData());
|
||||
asset_add_path(QDir(path).filePath("86Box/assets").toUtf8().constData());
|
||||
#else
|
||||
asset_add_path(QDir(path).filePath("86Box/asset").toUtf8().constData());
|
||||
asset_add_path(QDir(path).filePath("86Box/assets").toUtf8().constData());
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user