diff --git a/Qt/PPSSPP.pro b/Qt/PPSSPP.pro index 87b5bf4528..235810ca1d 100755 --- a/Qt/PPSSPP.pro +++ b/Qt/PPSSPP.pro @@ -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) diff --git a/Qt/QtHost.cpp b/Qt/QtHost.cpp index c066397955..e4f29465fb 100644 --- a/Qt/QtHost.cpp +++ b/Qt/QtHost.cpp @@ -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/"); diff --git a/Qt/assets.qrc b/Qt/assets.qrc index 23573a9510..0c07b29fa8 100644 --- a/Qt/assets.qrc +++ b/Qt/assets.qrc @@ -2,5 +2,9 @@ ../assets/ui_atlas_lowmem.zim ../assets/ppge_atlas.zim + ../assets/langregion.ini + ../assets/unknown.png + ../assets/shaders + ../flash0/font diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp index 27185a0e3d..c6334b68f3 100644 --- a/UI/NativeApp.cpp +++ b/UI/NativeApp.cpp @@ -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)); diff --git a/native b/native index 2b47807497..4177cf49db 160000 --- a/native +++ b/native @@ -1 +1 @@ -Subproject commit 2b47807497f0281d788a5442e2a13888d735c471 +Subproject commit 4177cf49db2310a76a116f5d7ae5853b7a0354d6