X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fmsys2%2FREADME;h=fb69c88d56c361011b3b14d594b92ae5c82e4dc7;hp=4cacaf4c1e9eaaabef2de68fd695c29fd336c085;hb=ef311ddb9282ea0cb1ff1a0365f8368c270f742c;hpb=c11260b1e2016c72a8b6c392d3482a2b61b9c0fb diff --git a/cross-compile/msys2/README b/cross-compile/msys2/README index 4cacaf4..fb69c88 100644 --- a/cross-compile/msys2/README +++ b/cross-compile/msys2/README @@ -23,17 +23,17 @@ Toolchain setup First, you need to install MSYS2 (use the 64bit installer, msys2-x86_64-*.exe): - https://sourceforge.net/p/msys2/wiki/MSYS2%20installation/ + http://www.msys2.org + https://github.com/msys2/msys2/wiki/MSYS2-installation Then, perform the MSYS2 update procedure as per the documentation above. - $ update-core - (If one of the packages is updated here, you MUST restart MSYS2) + $ pacman -Syu # If needed, close MSYS2, run it again from Start menu. $ pacman -Su -Now close the shell and start an "MSYS2 MinGW32" shell (do NOT use the -"MSYS2 Shell", and do NOT use the "MSYS2 MinGW64" shell). All other -steps will always have to be performed in an "MSYS2 MinGW32" shell. +Now close the shell and start an "MSYS2 MinGW 64-bit" or "MSYS2 MinGW 32-bit" +shell (do NOT use the "MSYS2 MSYS" shell). All other steps will always have to +be performed in an "MSYS2 MinGW 62-bit" or "MSYS2 MinGW 32-bit" shell. Install the MSYS2 git package there: @@ -53,7 +53,10 @@ Building Per default it will install the compiled packages in: - $HOME/sr_msys2 + $HOME/sr_msys2_release_32 + +This depends on whether you're running the build in a "MSYS2 MinGW 64-bit" or +"MSYS2 MinGW 32-bit" shell, and whether you enabled debug builds or not. Please edit the script if you want to change any settings.