aboutsummaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorNadia Holmquist Pedersen <nadia@nhp.sh>2022-11-09 19:54:35 +0100
committerNadia Holmquist Pedersen <nadia@nhp.sh>2022-11-09 19:54:35 +0100
commitb069a2acf10e58579d82500fb057f275647507c0 (patch)
tree9accce56f9ae6e0424680810afa485cd5dc93be5 /README.md
parent726fde4e8de3ae50df0373476ba1d952c04b7b67 (diff)
Clean Windows build instructions
* CMake in MSYS2 now depends on Ninja and uses it by default, use it instead of Make as it has much easier to read output when doing parallel builds and doesn't need an extra program * Ninja uses the maximum number of cores by default, so we don't have to run nproc --all * We don't need mesa for its headers anymore
Diffstat (limited to 'README.md')
-rw-r--r--README.md12
1 files changed, 6 insertions, 6 deletions
diff --git a/README.md b/README.md
index f18dfd6..f7b0d30 100644
--- a/README.md
+++ b/README.md
@@ -65,22 +65,22 @@ As for the rest, the interface should be pretty straightforward. If you have a q
cd melonDS
```
#### Dynamic builds (with DLLs)
-5. Install dependencies: `pacman -S make mingw-w64-x86_64-{cmake,mesa,SDL2,toolchain,qt5-base,qt5-svg,qt5-multimedia,libslirp,libarchive}`
+5. Install dependencies: `pacman -S mingw-w64-x86_64-{cmake,SDL2,toolchain,qt5-base,qt5-svg,qt5-multimedia,libslirp,libarchive}`
6. Compile:
```bash
- cmake -B build -G "MSYS Makefiles"
- cmake --build build -j$(nproc --all)
+ cmake -B build
+ cmake --build build
cd build
../tools/msys-dist.sh
```
If everything went well, melonDS and the libraries it needs should now be in the `dist` folder.
#### Static builds (without DLLs, standalone executable)
-5. Install dependencies: `pacman -S make mingw-w64-x86_64-{cmake,mesa,SDL2,toolchain,qt5-static,libslirp,libarchive}`
+5. Install dependencies: `pacman -S mingw-w64-x86_64-{cmake,SDL2,toolchain,qt5-static,libslirp,libarchive}`
6. Compile:
```bash
- cmake -B build -G 'MSYS Makefiles' -DBUILD_STATIC=ON -DCMAKE_PREFIX_PATH=/mingw64/qt5-static
- cmake --build build -j$(nproc --all)
+ cmake -B build -DBUILD_STATIC=ON -DCMAKE_PREFIX_PATH=/mingw64/qt5-static
+ cmake --build build
```
If everything went well, melonDS should now be in the `build` folder.