diff options
Diffstat (limited to 'README.adoc')
| -rw-r--r-- | README.adoc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/README.adoc b/README.adoc index eae2c82..172224a 100644 --- a/README.adoc +++ b/README.adoc @@ -33,8 +33,9 @@ including link:xC.adoc#_key_bindings[keyboard shortcuts]. image::xP.webp[align="center"] -xA, xW, xM ----------- +<<<<<<< HEAD +xA, xF, xW, xM +-------------- The native frontends for 'xC'. Using them is not recommended. xD @@ -85,16 +86,17 @@ or as a https://git.janouch.name/p/nixexprs[Nix derivation]. Building -------- Build-only dependencies: CMake, pkg-config, awk, liberty (included), - asciidoctor or asciidoc (recommended but optional) + + asciidoctor or asciidoc (recommended but optional), rsvg-convert (for 'xF') + Common runtime dependencies: openssl + Additionally for 'xC': curses, libffi, readline >= 6.0 or libedit >= 2013-07-12, lua >= 5.3 (optional) + +Additionally for 'xF': x11, xrender, xft, fontconfig, libpng $ git clone --recursive https://git.janouch.name/p/xK.git $ mkdir xK/build $ cd xK/build $ cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DWANT_READLINE=ON -DWANT_LIBEDIT=OFF -DWITH_LUA=ON + -DWANT_READLINE=ON -DWANT_LIBEDIT=OFF -DWITH_LUA=ON -DWITH_XF=OFF $ make To install the application, you can do either the usual: |