piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-06-28 09:59:41 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #701 from rzumer/patch-2

Browse Source 
Update build process and instructions
This commit is contained in:
RSDuck
2020-08-11 16:41:38 +02:00
committed by GitHub
parent f23e782966 68e310e4ef
commit e217d016a7
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/build-windows.yml vendored
View File

@ -36,9 +36,8 @@ jobs:
- name: Make - name: Make
run: | run: |
C:\tools\msys64\usr\bin\bash.exe -lc "export PATH=`"/mingw64/bin:`$PATH`" \ C:\tools\msys64\usr\bin\bash.exe -lc "export PATH=`"/mingw64/bin:`$PATH`" \
&& cd melonDS/build && make -j$(nproc --all) \ && cd melonDS/build && make -j$(nproc --all)"
&& ../msys-dist.sh"
- uses: actions/upload-artifact@v1 - uses: actions/upload-artifact@v1
with: with:
name: melonDS name: melonDS
path: C:\tools\msys64\home\runneradmin\melonDS\build\dist path: C:\tools\msys64\home\runneradmin\melonDS\build\melonDS.exe

4
README.md
View File

@ -38,7 +38,7 @@ As for the rest, the interface should be pretty straightforward. If you have a q
* Install dependencies: * Install dependencies:
```sh ```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: * Compile:
@ -55,7 +55,7 @@ make -j$(nproc --all)
1. Install [MSYS2](https://www.msys2.org/) 1. Install [MSYS2](https://www.msys2.org/)
2. Open the **MSYS2 MinGW 64-bit** terminal 2. Open the **MSYS2 MinGW 64-bit** terminal
3. Update the packages using `pacman -Syu` and reopen the terminal if it asks you to 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 5. Run the following commands
```bash ```bash
git clone https://github.com/Arisotura/melonDS.git git clone https://github.com/Arisotura/melonDS.git

3
msys-dist.sh
View File

@ -11,4 +11,5 @@ for lib in $(ldd melonDS.exe | grep mingw | sed "s/.*=> //" | sed "s/(.*)//"); d
cp "${lib}" dist cp "${lib}" dist
done done
cp melonDS.exe dist cp melonDS.exe dist
windeployqt dist