diff options
Diffstat (limited to 'src/frontend')
| -rw-r--r-- | src/frontend/qt_sdl/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | src/frontend/qt_sdl/main.cpp | 47 |
2 files changed, 52 insertions, 5 deletions
diff --git a/src/frontend/qt_sdl/CMakeLists.txt b/src/frontend/qt_sdl/CMakeLists.txt index 05c42d1..20cde39 100644 --- a/src/frontend/qt_sdl/CMakeLists.txt +++ b/src/frontend/qt_sdl/CMakeLists.txt @@ -49,6 +49,7 @@ find_package(PkgConfig REQUIRED) find_package(Iconv REQUIRED) pkg_check_modules(SDL2 REQUIRED sdl2) pkg_check_modules(SLIRP REQUIRED slirp) +pkg_check_modules(LIBZIP REQUIRED libzip) if (WIN32 AND (CMAKE_BUILD_TYPE STREQUAL Release)) add_executable(melonDS WIN32 ${SOURCES_QT_SDL}) @@ -60,15 +61,16 @@ target_link_libraries(melonDS ${CMAKE_THREAD_LIBS_INIT}) target_include_directories(melonDS PRIVATE ${SDL2_INCLUDE_DIRS}) target_include_directories(melonDS PRIVATE ${SLIRP_INCLUDE_DIRS}) +target_include_directories(melonDS PRIVATE ${LIBZIP_INCLUDE_DIRS}) target_include_directories(melonDS PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}") target_include_directories(melonDS PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/..") target_include_directories(melonDS PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../..") target_link_libraries(melonDS core) if (BUILD_STATIC) - target_link_libraries(melonDS -static ${SDL2_STATIC_LIBRARIES} ${SLIRP_STATIC_LIBRARIES}) + target_link_libraries(melonDS -static ${SDL2_STATIC_LIBRARIES} ${SLIRP_STATIC_LIBRARIES} ${LIBZIP_STATIC_LIBRARIES}) else() - target_link_libraries(melonDS ${SDL2_LIBRARIES} ${SLIRP_LIBRARIES}) + target_link_libraries(melonDS ${SDL2_LIBRARIES} ${SLIRP_LIBRARIES} ${LIBZIP_LIBRARIES}) endif() if (NOT Iconv_IS_BUILT_IN) @@ -82,9 +84,9 @@ elseif (WIN32) option(PORTABLE "Make a portable build that looks for its configuration in the current directory" ON) target_sources(melonDS PUBLIC "${CMAKE_SOURCE_DIR}/melon.rc") - target_link_libraries(melonDS comctl32 d2d1 dwrite uxtheme ws2_32 iphlpapi gdi32) + target_link_libraries(melonDS comctl32 d2d1 dwrite uxtheme ws2_32 iphlpapi gdi32 bcrypt) if (BUILD_STATIC) - target_link_libraries(melonDS imm32 winmm version setupapi -static Qt5::Core Qt5::Gui Qt5::Widgets z zstd) + target_link_libraries(melonDS imm32 winmm version setupapi -static Qt5::Core Qt5::Gui Qt5::Widgets zstd) else() target_link_libraries(melonDS Qt5::Core Qt5::Gui Qt5::Widgets) endif() diff --git a/src/frontend/qt_sdl/main.cpp b/src/frontend/qt_sdl/main.cpp index e7f35c2..c48e506 100644 --- a/src/frontend/qt_sdl/main.cpp +++ b/src/frontend/qt_sdl/main.cpp @@ -21,6 +21,10 @@ #include <stdio.h> #include <string.h> +#include <zip.h> +#include <fstream> +#include <iostream> + #include <QApplication> #include <QMessageBox> #include <QMenuBar> @@ -1412,15 +1416,56 @@ QString MainWindow::loadErrorStr(int error) } } +std::string extractROM(char* zipName, std::string zipDir){ + //Open the ZIP archive + int err = 0; + zip *z = zip_open(zipName, 0, &err); + + struct zip_stat st; + zip_stat_init(&st); + zip_stat_index(z, 0, 0, &st); //Get information about the file at index 0 + char newName[255]; + strcpy(newName, st.name); //fix for Linux invalid encoding filename + //Allocate memory for its uncompressed contents + u8 *contents = new u8[st.size]; + + //Read the compressed file + zip_file *f = zip_fopen_index(z, 0, 0); //Open file at index 0 + zip_fread(f, contents, st.size); + zip_fclose(f); + + zip_close(z); + + //Write the file (binary mode) + std::ofstream(zipDir + "/" + newName, std::ofstream::binary).write((char*) contents, st.size); + delete[] contents; + return zipDir + "/" + newName; +} void MainWindow::onOpenFile() { emuThread->emuPause(); + bool romExtracted = false; //No use yet but may be useful later QString filename = QFileDialog::getOpenFileName(this, "Open ROM", Config::LastROMFolder, - "DS ROMs (*.nds *.dsi *.srl);;GBA ROMs (*.gba);;Any file (*.*)"); + "DS ROMs (*.nds *.dsi *.srl *.zip);;GBA ROMs (*.gba *.zip);;Any file (*.*)"); + QFileInfo filenameExtLoc = filename; + + if (filenameExtLoc.completeSuffix().toUtf8() == "zip") + { + printf("Extracting ROM from ZIP...\n"); + std::string extractRomLoc = extractROM(filename.toUtf8().data(), filenameExtLoc.absolutePath().toUtf8().data()); + printf("Done.\n"); + filename = QString::fromUtf8(extractRomLoc.c_str()); + romExtracted = true; + } else if (filenameExtLoc.completeSuffix().toUtf8() == "") { + //do nothing + } else { + romExtracted = false; + } + if (filename.isEmpty()) { emuThread->emuUnpause(); |