From ce28d5725b079ee76d8a9af5c8a22eaa9fbbe78a Mon Sep 17 00:00:00 2001 From: Raphaël Zumer Date: Fri, 31 Jul 2020 20:20:47 +0000 Subject: Update dependencies in the readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1a01bc3..ce4f32a 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ As for the rest, the interface should be pretty straightforward. If you have a q * Install dependencies: ```sh -sudo apt-get install libgtk-3-dev libcurl4-gnutls-dev libpcap0.8-dev libsdl2-dev +sudo apt-get install libgtk-3-dev libcurl4-gnutls-dev libpcap0.8-dev libsdl2-dev qtbase5-dev qtdeclarative5-dev libslirp-dev ``` * Compile: @@ -55,7 +55,7 @@ make -j$(nproc --all) 1. Install [MSYS2](https://www.msys2.org/) 2. Open the **MSYS2 MinGW 64-bit** terminal 3. Update the packages using `pacman -Syu` and reopen the terminal if it asks you to -4. Install dependencies: `pacman -S git make mingw-w64-x86_64-{cmake,mesa,SDL2,toolchain}` +4. Install dependencies: `pacman -S git make mingw-w64-x86_64-{cmake,mesa,SDL2,toolchain,qt5,libslirp}` 5. Run the following commands ```bash git clone https://github.com/Arisotura/melonDS.git -- cgit v1.2.3 From 68e310e4ef971b42bb1ab4effd5c49ce1dd58c33 Mon Sep 17 00:00:00 2001 From: Raphaël Zumer Date: Fri, 31 Jul 2020 16:34:28 -0400 Subject: Deploy Qt libraries with dynamic Windows builds Also stop using msys-dist.sh with the static CI build. --- .github/workflows/build-windows.yml | 5 ++--- msys-dist.sh | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index bbf68af..569cebc 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -36,9 +36,8 @@ jobs: - name: Make run: | C:\tools\msys64\usr\bin\bash.exe -lc "export PATH=`"/mingw64/bin:`$PATH`" \ - && cd melonDS/build && make -j$(nproc --all) \ - && ../msys-dist.sh" + && cd melonDS/build && make -j$(nproc --all)" - uses: actions/upload-artifact@v1 with: name: melonDS - path: C:\tools\msys64\home\runneradmin\melonDS\build\dist + path: C:\tools\msys64\home\runneradmin\melonDS\build\melonDS.exe diff --git a/msys-dist.sh b/msys-dist.sh index 87c9d7e..d95a6d3 100755 --- a/msys-dist.sh +++ b/msys-dist.sh @@ -11,4 +11,5 @@ for lib in $(ldd melonDS.exe | grep mingw | sed "s/.*=> //" | sed "s/(.*)//"); d cp "${lib}" dist done -cp melonDS.exe dist \ No newline at end of file +cp melonDS.exe dist +windeployqt dist -- cgit v1.2.3