libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2025-02-03 23:46:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Qt: Use AssetsAssetReader to load Qt assets.

Browse Source
This commit is contained in:
Sacha 2013-11-21 20:11:14 +10:00
parent 37beb1a54a
commit 61cf802836
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Qt/PPSSPP.pro
View File

@ -112,8 +112,6 @@ symbian {
ICON = ../assets/icon.svg
# Folders:
assets.sources = ../flash0 ../assets/langregion.ini ../assets/unknown.png
assets.path = E:/PPSSPP
shaders.sources = ../assets/shaders
shaders.path = E:/PPSSPP/PSP
lang.sources = $$files(../lang/*.ini)
@ -128,8 +126,6 @@ symbian {
contains(MEEGO_EDITION,harmattan) {
target.path = /opt/PPSSPP/bin
assets.files = ../flash0 ../assets/langregion.ini ../assets/unknown.png
assets.path = /opt/PPSSPP
shaders.files = ../assets/shaders
shaders.path = /opt/PPSSPP/PSP
lang.files = $$files(../lang/*.ini)

1
Qt/QtHost.cpp
View File

@ -247,6 +247,7 @@ void NativeInit(int argc, const char *argv[], const char *savegame_directory, co
VFSRegister("", new DirectoryAssetReader("assets/"));
VFSRegister("", new DirectoryAssetReader(user_data_path.c_str()));
VFSRegister("", new AssetsAssetReader());
g_Config.AddSearchPath(user_data_path);
g_Config.AddSearchPath(memcard_path + "PSP/SYSTEM/");

4
Qt/assets.qrc
View File

@ -2,5 +2,9 @@
<qresource prefix="/">
<file alias="assets/ui_atlas.zim">../assets/ui_atlas_lowmem.zim</file>
<file alias="assets/ppge_atlas.zim">../assets/ppge_atlas.zim</file>
<file alias="assets/langregion.ini">../assets/langregion.ini</file>
<file alias="assets/unknown.png">../assets/unknown.png</file>
<file alias="assets/shaders">../assets/shaders</file>
<file alias="assets/flash0/font">../flash0/font</file>
</qresource>
</RCC>

4
UI/NativeApp.cpp
View File

@ -247,7 +247,9 @@ void NativeInit(int argc, const char *argv[],
#endif
// We want this to be FIRST.
#ifndef USING_QT_UI
#ifdef USING_QT_UI
VFSRegister("", new AssetsAssetReader());
#else
#if defined(BLACKBERRY) || defined(IOS)
// Packed assets are included in app
VFSRegister("", new DirectoryAssetReader(external_directory));

2
native

@ -1 +1 @@
Subproject commit 2b47807497f0281d788a5442e2a13888d735c471
Subproject commit 4177cf49db2310a76a116f5d7ae5853b7a0354d6