aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/build-ubuntu-aarch64.yml2
-rw-r--r--.github/workflows/build-ubuntu.yml2
-rw-r--r--.github/workflows/build-windows.yml2
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/frontend/qt_sdl/CMakeLists.txt10
-rw-r--r--src/frontend/qt_sdl/main.cpp47
6 files changed, 56 insertions, 8 deletions
diff --git a/.github/workflows/build-ubuntu-aarch64.yml b/.github/workflows/build-ubuntu-aarch64.yml
index 8ece6f2..c019630 100644
--- a/.github/workflows/build-ubuntu-aarch64.yml
+++ b/.github/workflows/build-ubuntu-aarch64.yml
@@ -32,7 +32,7 @@ jobs:
sudo rm /etc/apt/sources.list
sudo mv /etc/apt/sources.list{.new,}
sudo apt update
- sudo apt install {gcc-10,g++-10,pkg-config}-aarch64-linux-gnu libsdl2-dev:arm64 qtbase5-dev:arm64 libslirp-dev:arm64
+ sudo apt install {gcc-10,g++-10,pkg-config}-aarch64-linux-gnu libsdl2-dev:arm64 qtbase5-dev:arm64 libslirp-dev:arm64 libzip-dev:arm64
- name: Create build environment
run: mkdir ${{runner.workspace}}/build
- name: Configure
diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml
index 5974c69..339db17 100644
--- a/.github/workflows/build-ubuntu.yml
+++ b/.github/workflows/build-ubuntu.yml
@@ -25,7 +25,7 @@ jobs:
run: | # Fetch a new version of CMake, because the default is too old.
sudo rm -f /etc/apt/sources.list.d/dotnetdev.list /etc/apt/sources.list.d/microsoft-prod.list \
&& sudo apt-get update \
- && sudo apt-get install cmake libcurl4-gnutls-dev libpcap0.8-dev libsdl2-dev qt5-default libslirp-dev
+ && sudo apt-get install cmake libcurl4-gnutls-dev libpcap0.8-dev libsdl2-dev qt5-default libslirp-dev libzip-dev
- name: Create build environment
run: mkdir ${{runner.workspace}}/build
- name: Configure
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index bbf68af..4f2fe65 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -24,7 +24,7 @@ jobs:
choco install msys2
C:\tools\msys64\usr\bin\bash.exe -lc "pacman -Syuq --noconfirm"
- name: Install dependencies
- run: C:\tools\msys64\usr\bin\bash.exe -lc "pacman -Sq --noconfirm git make mingw-w64-x86_64-{cmake,mesa,SDL2,qt5-static,libslirp,toolchain}"
+ run: C:\tools\msys64\usr\bin\bash.exe -lc "pacman -Sq --noconfirm git make mingw-w64-x86_64-{cmake,mesa,SDL2,qt5-static,libslirp,libzip,toolchain}"
- name: Create build environment
run: |
New-Item -ItemType directory -Path ${{runner.workspace}}\melonDS\build
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index dd81f52..b2d0744 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -94,6 +94,7 @@ if (ENABLE_JIT)
endif()
endif()
+
if (WIN32)
target_link_libraries(core ole32 comctl32 ws2_32 opengl32)
else()
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();