diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e0db28925..138661ef83 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -763,7 +763,7 @@ elseif(USING_QT_UI) Qt/mainwindow.h ) add_definitions(-DUSING_QT_UI) - include_directories(${CMAKE_CURRENT_BINARY_DIR} Qt Qt/Debugger) + include_directories(${CMAKE_CURRENT_BINARY_DIR} Qt) set(nativeExtraLibs ${nativeExtraLibs} Qt5::OpenGL Qt5::Gui Qt5::Core) set(TargetBin PPSSPPQt) diff --git a/Qt/desktop_assets.qrc b/Qt/desktop_assets.qrc deleted file mode 100644 index c65de91f71..0000000000 --- a/Qt/desktop_assets.qrc +++ /dev/null @@ -1,16 +0,0 @@ - - - ../assets/ui_atlas.zim - ../assets/ppge_atlas.zim - ../assets/lang - ../assets/compat.ini - ../assets/langregion.ini - ../assets/unknown.png - ../assets/rargray.png - ../assets/zip.png - ../assets/shaders - ../flash0/font - resources/breakpointDisable.ico - resources/breakpoint.ico - - diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp index 8ae0bedb41..73781e2b61 100644 --- a/UI/NativeApp.cpp +++ b/UI/NativeApp.cpp @@ -360,9 +360,7 @@ void NativeInit(int argc, const char *argv[], const char *savegame_dir, const ch #endif // We want this to be FIRST. -#ifdef USING_QT_UI - VFSRegister("", new AssetsAssetReader()); -#elif defined(IOS) +#if defined(IOS) // Packed assets are included in app VFSRegister("", new DirectoryAssetReader(external_dir)); #endif diff --git a/ext/native/file/zip_read.cpp b/ext/native/file/zip_read.cpp index fa3a7c38f6..5069cfc223 100644 --- a/ext/native/file/zip_read.cpp +++ b/ext/native/file/zip_read.cpp @@ -3,11 +3,6 @@ #include #include -#ifdef USING_QT_UI -#include -#include -#endif - #ifdef __ANDROID__ #include #endif @@ -66,58 +61,6 @@ uint8_t *ReadLocalFile(const char *filename, size_t *size) { return contents; } -#ifdef USING_QT_UI -uint8_t *AssetsAssetReader::ReadAsset(const char *path, size_t *size) { - QFile asset(QString(":/assets/") + path); - if (!asset.open(QIODevice::ReadOnly)) - return 0; - - uint8_t *contents = new uint8_t[asset.size()+1]; - memcpy(contents, (uint8_t*)asset.readAll().data(), asset.size()); - contents[asset.size()] = 0; - *size = asset.size(); - asset.close(); - return contents; -} - -bool AssetsAssetReader::GetFileListing(const char *path, std::vector *listing, const char *filter = 0) -{ - QDir assetDir(QString(":/assets/") + path); - QStringList filters = QString(filter).split(':', QString::SkipEmptyParts); - for (int i = 0; i < filters.count(); i++) - filters[i].prepend("*."); - - QFileInfoList infoList = assetDir.entryInfoList(filters, QDir::AllDirs | QDir::NoDotAndDotDot | QDir::Files, QDir::Name); - foreach(QFileInfo qinfo, infoList) { - FileInfo info; - info.name = qinfo.fileName().toStdString(); - info.fullName = qinfo.absoluteFilePath().remove(":/assets/").toStdString(); - info.exists = true; - info.isWritable = false; - info.isDirectory = qinfo.isDir(); - listing->push_back(info); - } - return true; -} - -bool AssetsAssetReader::GetFileInfo(const char *path, FileInfo *info) { - QFileInfo qinfo(QString(":/assets/") + path); - if (!qinfo.exists()) { - info->exists = false; - info->size = 0; - return false; - } - - info->fullName = path; - info->exists = true; - info->isWritable = false; - info->isDirectory = qinfo.isDir(); - info->size = qinfo.size(); - return true; -} - -#endif - #ifdef __ANDROID__ ZipAssetReader::ZipAssetReader(const char *zip_file, const char *in_zip_path) { diff --git a/ext/native/file/zip_read.h b/ext/native/file/zip_read.h index 7e2ecbbf45..3607ddb926 100644 --- a/ext/native/file/zip_read.h +++ b/ext/native/file/zip_read.h @@ -26,21 +26,6 @@ public: virtual std::string toString() const = 0; }; -#ifdef USING_QT_UI -class AssetsAssetReader : public AssetReader { -public: - AssetsAssetReader() {} - ~AssetsAssetReader() {} - // use delete[] - virtual uint8_t *ReadAsset(const char *path, size_t *size); - virtual bool GetFileListing(const char *path, std::vector *listing, const char *filter); - virtual bool GetFileInfo(const char *path, FileInfo *info); - virtual std::string toString() const { - return ":assets/"; - } -}; -#endif - #ifdef __ANDROID__ uint8_t *ReadFromZip(zip *archive, const char* filename, size_t *size); class ZipAssetReader : public AssetReader {