diff options
| author | Dylan Khor <thekhord@gmail.com> | 2018-10-22 14:29:04 -0400 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2018-10-22 11:29:04 -0700 |
| commit | fbc6bd82664f7286e358e14da6c7945aa061ee3b (patch) | |
| tree | 26310edf1716229bc9d26e51bbebcf266a527364 /docs | |
| parent | 91bfbb62560cc237066de2392eefbb271eff9d6b (diff) | |
| download | qmk_firmware-fbc6bd82664f7286e358e14da6c7945aa061ee3b.tar.gz qmk_firmware-fbc6bd82664f7286e358e14da6c7945aa061ee3b.zip | |
Minor updates to build tools docs revised (#4195)
* add initial khord iris keymap
* correct path of windows qmk install script
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/getting_started_build_tools.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/getting_started_build_tools.md b/docs/getting_started_build_tools.md index dd3e7805a..88f3642b2 100644 --- a/docs/getting_started_build_tools.md +++ b/docs/getting_started_build_tools.md | |||
| @@ -62,7 +62,7 @@ If you're using [homebrew,](http://brew.sh/) you can use the following commands: | |||
| 62 | brew install gcc-arm-none-eabi | 62 | brew install gcc-arm-none-eabi |
| 63 | brew install avrdude | 63 | brew install avrdude |
| 64 | 64 | ||
| 65 | This is the recommended method. If you don't have homebrew, [install it!](http://brew.sh/) It's very much worth it for anyone who works in the command line. Note that the `make` and `make install` portion during the homebrew installation of avr-libc can take over 20 minutes and exhibit high CPU usage. | 65 | This is the recommended method. If you don't have homebrew, [install it!](http://brew.sh/) It's very much worth it for anyone who works in the command line. Note that the `make` and `make install` portion during the homebrew installation of `avr-gcc@7` can take over 20 minutes and exhibit high CPU usage. |
| 66 | 66 | ||
| 67 | ## Windows with msys2 (recommended) | 67 | ## Windows with msys2 (recommended) |
| 68 | 68 | ||
| @@ -70,9 +70,9 @@ The best environment to use, for Windows Vista through any later version (tested | |||
| 70 | 70 | ||
| 71 | * Install msys2 by downloading it and following the instructions here: http://www.msys2.org | 71 | * Install msys2 by downloading it and following the instructions here: http://www.msys2.org |
| 72 | * Open the ``MSYS2 MingGW 64-bit`` shortcut | 72 | * Open the ``MSYS2 MingGW 64-bit`` shortcut |
| 73 | * Navigate to your qmk checkout. For example, if it's in the root of your c drive: | 73 | * Navigate to your QMK repository. For example, if it's in the root of your c drive: |
| 74 | * `$ cd /c/qmk_firmware` | 74 | * `$ cd /c/qmk_firmware` |
| 75 | * Run `util/msys2_install.sh` and follow the prompts | 75 | * Run `util/qmk_install.sh` and follow the prompts |
| 76 | 76 | ||
| 77 | ## Windows 10 (deprecated) | 77 | ## Windows 10 (deprecated) |
| 78 | These are the old instructions for Windows 10. We recommend you use [MSYS2 as outlined above](#windows-with-msys2-recommended). | 78 | These are the old instructions for Windows 10. We recommend you use [MSYS2 as outlined above](#windows-with-msys2-recommended). |
