libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2024-12-03 14:40:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Qt: Remove renaming of 'lowmem' zim so that it can be loaded externally as well. Update version.

Browse Source
This commit is contained in:
Sacha 2013-12-20 01:30:39 +10:00
parent 1d7a28ff27
commit af1c326617
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Qt/QtHost.cpp
View File

@ -462,7 +462,7 @@ void NativeInitGraphics()
UIInit(&ui_atlas, theme);
uiTexture = new Texture();
if (!uiTexture->Load("ui_atlas.zim"))
if (!uiTexture->Load("ui_atlas_lowmem.zim"))
{
qDebug() << "Failed to load texture";
}

2
Qt/Settings.pri
View File

@ -1,4 +1,4 @@
VERSION = 0.9.5
VERSION = 0.9.6
DEFINES += USING_QT_UI USE_FFMPEG
unix:!qnx:!symbian:!mac: CONFIG += linux

2
Qt/assets.qrc
View File

@ -1,6 +1,6 @@
<RCC>
<qresource prefix="/">
<file alias="assets/ui_atlas.zim">../assets/ui_atlas_lowmem.zim</file>
<file alias="assets/ui_atlas_lowmem.zim">../assets/ui_atlas_lowmem.zim</file>
<file alias="assets/ppge_atlas.zim">../assets/ppge_atlas.zim</file>
<file alias="assets/lang">../lang</file>
<file alias="assets/langregion.ini">../assets/langregion.ini</file>

2
Qt/desktop_assets.qrc
View File

@ -1,6 +1,6 @@
<RCC>
<qresource prefix="/">
<file alias="assets/ui_atlas.zim">../assets/ui_atlas_lowmem.zim</file>
<file alias="assets/ui_atlas_lowmem.zim">../assets/ui_atlas_lowmem.zim</file>
<file alias="assets/ppge_atlas.zim">../assets/ppge_atlas.zim</file>
<file alias="assets/lang">../lang</file>
<file alias="assets/langregion.ini">../assets/langregion.ini</file>

4
UI/NativeApp.cpp
View File

@ -470,7 +470,11 @@ void NativeInitGraphics() {
ui_draw2d_front.Init();
uiTexture = new Texture();
#ifdef USING_QT_UI
if (!uiTexture->Load("ui_atlas_lowmem.zim")) {
#else
if (!uiTexture->Load("ui_atlas.zim")) {
#endif
PanicAlert("Failed to load ui_atlas.zim.\n\nPlace it in the directory \"assets\" under your PPSSPP directory.");
ELOG("Failed to load ui_atlas.zim");
}