diff options
| author | Yurii Kolesnykov <root@yurikoles.com> | 2020-11-16 03:32:45 +0300 |
|---|---|---|
| committer | Yurii Kolesnykov <root@yurikoles.com> | 2020-11-16 03:41:27 +0300 |
| commit | f7b4c9b34a3830aaa735a9d8168681f183f34ea2 (patch) | |
| tree | efcf7e46731107362b82d7fbac426859039231ca /README.md | |
| parent | 5533c9118acbd9b95019869c42b30e4716b07439 (diff) | |
macOS fixes:
* Update brew-way installation instructions
* Sort dependecies in Brewfile
Signed-off-by: Yurii Kolesnykov <root@yurikoles.com>
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 45 |
1 files changed, 21 insertions, 24 deletions
@@ -56,12 +56,12 @@ cd build _with make:_ ``` sh cmake -DUSEWX=yes -DCMAKE_BUILD_TYPE=Release .. -make -j4 +make -j$(nproc --all) ``` _or with ninja (you need **ninja-build** package installed)_ ``` sh cmake -DUSEWX=yes -DCMAKE_BUILD_TYPE=Release -G Ninja .. -ninja -j4 +ninja -j$(nproc --all) ``` #### OSX/MacOS install @@ -71,45 +71,42 @@ ninja -j4 clang++ -v ``` - * Install Homebrew if you don't have it: -```sh -ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" -``` + * If you don't have Homebrew stop by <https://brew.sh/> for installation instructions. ##### One line OSX/MacOS install - * Install stable far2l via unofficial brew tap: -```sh -brew install yurikoles/yurikoles/far2l -``` - - * Latest git master can be installed via: + * Install latest far2l git master via unofficial brew tap: ```sh -brew install yurikoles/yurikoles/far2l --HEAD +brew install --HEAD yurikoles/yurikoles/far2l ``` + * Available options: + * `--with-python@3.9`: build with python support + * `--with-wxmac`: build with wxmac support ##### Hard way OSX/MacOS install - with building from sources: - * Install required packages: -```sh -brew install cmake gawk ninja pkg-config wget wxmac xerces-c spdlog uchardet libssh libnfs neon libarchive pcre -``` * Clone: -``` sh +```sh git clone https://github.com/elfmz/far2l cd far2l -mkdir build -cd build +``` + * Install required packages: +```sh +brew bundle ``` _with make:_ -``` sh +```sh +mkdir build +cd build cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DUSEWX=yes -DCMAKE_BUILD_TYPE=Release .. -make -j4 +make -j$(nproc --all) ``` _or with ninja_ -``` sh +```sh +mkdir build +cd build cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DUSEWX=yes -DCMAKE_BUILD_TYPE=Release -G Ninja .. -ninja -j4 +ninja -j$(nproc --all) ``` To build without WX backend (console version only): change -DUSEWX=yes to -DUSEWX=no |