From 35b2338251cd2b087037b1a313bdbd5aeccf4655 Mon Sep 17 00:00:00 2001 From: Otto Allmendinger Date: Thu, 18 Sep 2014 10:13:37 +0200 Subject: [PATCH] Add generic cmake instructions, remove android doc Android build system is outdated --- README.md | 18 ++++++++++++------ docs/INSTALL-Android.txt | 12 ------------ 2 files changed, 12 insertions(+), 18 deletions(-) delete mode 100644 docs/INSTALL-Android.txt diff --git a/README.md b/README.md index 7500a3c360..9086199988 100644 --- a/README.md +++ b/README.md @@ -53,12 +53,23 @@ clang-format each time you push or commit. To do so type in the repo directory: ln -s ../../scripts/git_hooks/pre-push ln -s ../../scripts/git_hooks/pre-commit -To check your code without pushing the following command can be used: +To check your code without pushing the following command can be used: git push -n ### Build Instructions +OpenTransactions uses the CMake build system. The basic steps are + + mkdir build + cd build + cmake .. + make + make install + + +More detailed instructions are listed below + #### Linux * [Generic Linux](docs/INSTALL-MEMO-Linux.txt) @@ -73,8 +84,3 @@ To check your code without pushing the following command can be used: #### Windows * [Windows (Vista SP2+)](docs/INSTALL-Windows.txt) - -#### Android - - * [Android](https://github.com/monetas/ot-android) - diff --git a/docs/INSTALL-Android.txt b/docs/INSTALL-Android.txt deleted file mode 100644 index 7255f65cb3..0000000000 --- a/docs/INSTALL-Android.txt +++ /dev/null @@ -1,12 +0,0 @@ -######################################################################### -# # -# # -# ## INSTALL - Android ## # -# # -# # -######################################################################### - - -You can find a build system for Open Transactions on Android at - -https://github.com/monetas/ot-android