diff options
-rw-r--r-- | .github/workflows/build-ubuntu-aarch64.yml | 2 | ||||
-rw-r--r-- | .github/workflows/build-ubuntu.yml | 2 | ||||
-rw-r--r-- | .github/workflows/build-windows.yml | 2 | ||||
-rw-r--r-- | src/CMakeLists.txt | 5 |
4 files changed, 6 insertions, 5 deletions
diff --git a/.github/workflows/build-ubuntu-aarch64.yml b/.github/workflows/build-ubuntu-aarch64.yml index 6d0bfde..761bd6d 100644 --- a/.github/workflows/build-ubuntu-aarch64.yml +++ b/.github/workflows/build-ubuntu-aarch64.yml @@ -26,7 +26,7 @@ jobs: && sudo rm /etc/apt/sources.list \ && sudo mv /etc/apt/sources.list{.new,} \ && sudo apt-get update \ - && sudo apt-get install {gcc-10,g++-10,pkg-config}-aarch64-linux-gnu libsdl2-dev:arm64 qtbase5-dev:arm64 + && sudo apt-get install {gcc-10,g++-10,pkg-config}-aarch64-linux-gnu libsdl2-dev:arm64 libzip:arm64 qtbase5-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 4ecdae0..71c421b 100644 --- a/.github/workflows/build-ubuntu.yml +++ b/.github/workflows/build-ubuntu.yml @@ -27,7 +27,7 @@ jobs: && tar -zxf cmake-$CMAKE_VERSION-Linux-x86_64.tar.gz \ && 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 gtk+-3.0 libcurl4-gnutls-dev libpcap0.8-dev libsdl2-dev qt5-default + && sudo apt-get install gtk+-3.0 libcurl4-gnutls-dev libpcap0.8-dev libsdl2-dev libzip-dev qt5-default - 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 b8e8b04..709f1cd 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -25,7 +25,7 @@ jobs: 7z x -y msys64.7z "-oC:\tools\" 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,toolchain}" + run: C:\tools\msys64\usr\bin\bash.exe -lc "pacman -Sq --noconfirm git make mingw-w64-x86_64-{cmake,mesa,SDL2,qt5-static,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 84bbc2b..f1a5a91 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -93,8 +93,9 @@ if (ENABLE_JIT) endif() endif() +find_library(LIBZIP_LIB zip) if (WIN32) - target_link_libraries(core ole32 comctl32 ws2_32 opengl32) + target_link_libraries(core ole32 comctl32 ws2_32 opengl32 ${LIBZIP_LIB}) else() - target_link_libraries(core GL EGL) + target_link_libraries(core GL EGL ${LIBZIP_LIB}) endif() |