From a5e5e5802b5f888d9a61e8a8344cbea49fbc5b86 Mon Sep 17 00:00:00 2001 From: Thomas Debesse Date: Fri, 31 May 2019 17:02:06 +0200 Subject: [PATCH] msys2: update build instructions in readme - add minizip and git to pacman packages to install * minizip is required by netradiant and q3map2 * git is required by gamepack-manager * other game packs may require subversion - tell how to use mingw over ssh - autodetect mingw architecture, give instruction to override - fix a typo (a i character was mistakenly added somewhere) --- README.md | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 62705069..6f6e5c76 100644 --- a/README.md +++ b/README.md @@ -36,20 +36,26 @@ See also https://gitlab.com/xonotic/netradiant/ for a source browser, issues and ## msys2 -Under MSYS2, the mingw shell must be used +Under MSYS2, the mingw shell must be used. -### 32 bit: +If you use MSYS2 over SSH, add `mingw64` to the path this way (given you compile for 64 bit windows): ``` -pacman -S --needed base-devel mingw-w64-i686-{toolchain,cmake,make,gtk2,gtkglexti,libwebp} +export PATH="/mingw64/bin:${PATH}"` ``` -### 64 bit: +Install the dependencies this way: + ``` -pacman -S --needed base-devel mingw-w64-x86_64-{toolchain,cmake,make,gtk2,gtkglext,libwebp} +pacman -S --needed base-devel mingw-w64-$(uname -m)-{toolchain,cmake,make,gtk2,gtkglext,libwebp,minizip-git} git ``` +Explicitely use `mingw-w64-x86_64-` or `mingw-w64-i686-` prefix if you need to target a non-default architecture. + +You may have to install `subversion` to fetch some non-default game packages. + + ## macOS: ``` -- 2.39.2