Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-26 23:10:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Qt: Put all resources in to the binary. The app should be standalone now. Also fixes #4615

Browse Source
This commit is contained in:
Sacha 2013-11-22 16:15:10 +10:00
parent d892f7077d
commit fa7871869e
4 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Qt/PPSSPP.pro
View File

@ -75,6 +75,7 @@ SOURCES += $$P/UI/*Screen.cpp \
$$P/UI/GameInfoCache.cpp \
$$P/UI/OnScreenDisplay.cpp \
$$P/UI/UIShader.cpp \
$$P/UI/ui_atlas_lowmem.cpp \
$$P/android/jni/TestRunner.cpp
HEADERS += $$P/UI/*.h
@ -103,7 +104,6 @@ INCLUDEPATH += $$P $$P/Common $$P/native
SOURCES += $$P/UI/NativeApp.cpp
}
RESOURCES += assets.qrc
SOURCES += $$P/UI/ui_atlas_lowmem.cpp
# Packaging
symbian {
@ -112,13 +112,7 @@ symbian {
vendor_deploy.pkg_prerules = "%{\"Qtness\"}" ":\"Qtness\""
ICON = $$P/assets/icon.svg
# Folders:
shaders.sources = $$P/assets/shaders
shaders.path = E:/PPSSPP/PSP
lang.sources = $$files($$P/lang/*.ini)
lang.path = E:/PPSSPP/lang
DEPLOYMENT += vendor_deploy assets shaders lang
DEPLOYMENT += vendor_deploy
# 268 MB maximum
TARGET.EPOCHEAPSIZE = 0x40000 0x10000000
@ -127,15 +121,11 @@ symbian {
contains(MEEGO_EDITION,harmattan) {
target.path = /opt/PPSSPP/bin
shaders.files = $$P/assets/shaders
shaders.path = /opt/PPSSPP/PSP
lang.files = $$files($$P/lang/*.ini)
lang.path = /opt/PPSSPP/lang
desktopfile.files = PPSSPP.desktop
desktopfile.path = /usr/share/applications
icon.files = $$P/assets/icon-114.png
icon.path = /usr/share/icons/hicolor/114x114/apps
INSTALLS += target assets shaders lang desktopfile icon
INSTALLS += target desktopfile icon
# Booster
QMAKE_CXXFLAGS += -fPIC -fvisibility=hidden -fvisibility-inlines-hidden
QMAKE_LFLAGS += -pie -rdynamic

17
Qt/assets.qrc
View File

@ -1,10 +1,11 @@
<RCC>
<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>
<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/lang">../lang</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>

8
Qt/mainwindow.cpp
View File

@ -32,17 +32,17 @@ MainWindow::MainWindow(QWidget *parent) :
{
host = new QtHost(this);
emugl = new QtEmuGL();
showNormal();
setCentralWidget(emugl);
emugl->init(&input_state);
createMenus();
updateMenus();
int zoom = g_Config.iInternalResolution;
if (zoom < 1) zoom = 1;
if (zoom > 4) zoom = 4;
SetZoom(zoom);
createMenus();
updateMenus();
SetGameTitle(fileToStart);
startTimer(16);

2
native

@ -1 +1 @@
Subproject commit 4177cf49db2310a76a116f5d7ae5853b7a0354d6
Subproject commit 58035235dacdf50715ea23d25886475c635671bd