diff --git a/CHANGELOG.md b/CHANGELOG.md index 999d08676..9a3df33cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file. This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log... ## [unreleased][unreleased] + - Chg remove entirely ncurses, not needed nowadays (@doegox) - Chg remove deprecated termcap, use ncurses instead (@ZeroChaos-) - Chg 'hf iclass encrypt' - now takes transport key as param. (@iceman1001) - Chg 'hf iclass decrypt' - now takes transport key as param. (@iceman1001) diff --git a/COMPILING.txt b/COMPILING.txt index 04ff1d8bf..b1f5cb960 100644 --- a/COMPILING.txt +++ b/COMPILING.txt @@ -1,3 +1,6 @@ + +** BEWARE the instructions here might be outdated, better refer to doc/md/Installation_Instructions/ ** + The project compiles on Linux, Mac OS X and Windows (MinGW/MSYS). it requires: @@ -7,7 +10,6 @@ it requires: - libusb - perl - an ARM cross-compiler to compile the firmware -- libncurses5-dev and optionally QT for the GUI diff --git a/client/Makefile b/client/Makefile index 1ca87678a..ccf7d5ab8 100644 --- a/client/Makefile +++ b/client/Makefile @@ -90,7 +90,6 @@ else LIBS := -I/usr/local/opt/readline/include $(LIBS) else LUALIB += -ldl - LDLIBS += $(shell pkg-config --libs ncurses 2>/dev/null) LUAPLATFORM = linux endif endif diff --git a/doc/md/Installation_Instructions/Linux-Installation-Instructions.md b/doc/md/Installation_Instructions/Linux-Installation-Instructions.md index fe23db001..476309fb6 100644 --- a/doc/md/Installation_Instructions/Linux-Installation-Instructions.md +++ b/doc/md/Installation_Instructions/Linux-Installation-Instructions.md @@ -25,7 +25,7 @@ Install the requirements ```sh sudo apt-get install p7zip git ca-certificates build-essential libreadline5 libreadline-dev \ -libusb-0.1-4 libusb-dev perl pkg-config wget libncurses5-dev gcc-arm-none-eabi libnewlib-dev libqt4-dev +libusb-0.1-4 libusb-dev perl pkg-config wget gcc-arm-none-eabi libnewlib-dev libqt4-dev ``` If you don't need the graphical components of the Proxmark3 client, you can skip the installation of `libqt4-dev`. @@ -35,11 +35,7 @@ If you get some (non blocking) error at runtime such as _Gtk-Message: Failed to ## On ArchLinux ```sh -sudo pacman -Sy base-devel p7zip libusb readline ncurses arm-none-eabi-gcc arm-none-eabi-newlib git --needed -``` -Additional AUR packages: -```sh -yaourt -S termcap +sudo pacman -Sy base-devel p7zip libusb readline arm-none-eabi-gcc arm-none-eabi-newlib git --needed ``` If you want graphical output (such as in `hw tune`): ```sh diff --git a/doc/md/Installation_Instructions/Windows-Installation-Instructions.md b/doc/md/Installation_Instructions/Windows-Installation-Instructions.md index db9a9084f..e2895f73a 100644 --- a/doc/md/Installation_Instructions/Windows-Installation-Instructions.md +++ b/doc/md/Installation_Instructions/Windows-Installation-Instructions.md @@ -99,7 +99,7 @@ Enter WSL prompt (`wsl`) and from there, follow the [Linux Installation Instruct ```sh sudo apt-get update sudo apt-get install p7zip git ca-certificates build-essential libreadline5 libreadline-dev libusb-0.1-4 \ -libusb-dev perl pkg-config wget libncurses5-dev gcc-arm-none-eabi libstdc++-arm-none-eabi-newlib \ +libusb-dev perl pkg-config wget gcc-arm-none-eabi libstdc++-arm-none-eabi-newlib \ libqt4-dev ```