Include shaders in the installable packages for Blackberry, Symbian, Meego.

This commit is contained in:
Sacha 2013-10-17 14:29:34 +10:00
parent aa3cf34fc1
commit eb19a8b869
3 changed files with 8 additions and 3 deletions

View File

@ -20,6 +20,7 @@
<asset path="PPSSPPBlackberry" entry="true" type="Qnx/Elf">PPSSPPBlackberry</asset>
<asset path="../assets/icon-114.png">icon-114.png</asset>
<asset path="../android/assets">assets</asset>
<asset path="../assets/shaders">assets/shaders</asset>
<asset path="../lang">assets/lang</asset>
<asset path="../flash0">assets/flash0</asset>

View File

@ -92,7 +92,11 @@ void LoadPostShaderInfo(std::vector<std::string> directories) {
// Scans the directories for shader ini files and collects info about all the shaders found.
void LoadAllPostShaderInfo() {
std::vector<std::string> directories;
#ifdef BLACKBERRY
directories.push_back("app/native/assets/shaders");
#else
directories.push_back("assets/shaders");
#endif
directories.push_back(g_Config.memCardDirectory + "PSP/shaders");
LoadPostShaderInfo(directories);
}
@ -109,4 +113,4 @@ const ShaderInfo *GetPostShaderInfo(std::string name) {
const std::vector<ShaderInfo> &GetAllPostShaderInfo() {
LoadAllPostShaderInfo();
return shaderInfo;
}
}

View File

@ -106,7 +106,7 @@ symbian {
ICON = ../assets/icon.svg
# Folders:
assets.sources = ../flash0
assets.sources = ../flash0 ../assets/shaders
assets.path = E:/PPSSPP
lang.sources = $$files(../lang/*.ini)
@ -127,7 +127,7 @@ symbian {
contains(MEEGO_EDITION,harmattan) {
target.path = /opt/PPSSPP/bin
assets.files = ../flash0
assets.files = ../flash0 ../assets/shaders
assets.path = /opt/PPSSPP
lang.files = $$files(../lang/*.ini)
lang.path = /opt/PPSSPP/lang