Merge pull request #9459 from duganchen/qt_assets_dir

Fix assets directory for non-mobile, non-Windows Qt builds
This commit is contained in:
Henrik Rydgård 2017-03-19 17:14:37 +01:00 committed by GitHub
commit e43435ab2d

View File

@ -320,7 +320,8 @@ void NativeInit(int argc, const char *argv[], const char *savegame_dir, const ch
#elif defined(IOS)
// Packed assets are included in app
VFSRegister("", new DirectoryAssetReader(external_dir));
#elif !defined(MOBILE_DEVICE) && !defined(_WIN32)
#endif
#if !defined(MOBILE_DEVICE) && !defined(_WIN32)
VFSRegister("", new DirectoryAssetReader((File::GetExeDirectory() + "assets/").c_str()));
VFSRegister("", new DirectoryAssetReader((File::GetExeDirectory()).c_str()));
VFSRegister("", new DirectoryAssetReader("/usr/share/ppsspp/assets/"));