aboutsummaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2015-01-27 09:44:17 +0200
committerRiccardo Spagni <ric@spagni.net>2015-01-27 09:44:39 +0200
commitbd143e0c2f7c56b6c853ef79ff49db53e37cc366 (patch)
tree02deed1f25098093fb303e916a39421285ef52bf /README.md
parentMerge pull request #219 (diff)
parentadded portable slow-hash, updated makefile targets, fixed readme (diff)
downloadmonero-bd143e0c2f7c56b6c853ef79ff49db53e37cc366.tar.xz
Merge pull request #220
9b3673a added portable slow-hash, updated makefile targets, fixed readme (Riccardo Spagni)
Diffstat (limited to '')
-rw-r--r--README.md12
1 files changed, 6 insertions, 6 deletions
diff --git a/README.md b/README.md
index bd0866002..2fb87ef5e 100644
--- a/README.md
+++ b/README.md
@@ -56,14 +56,14 @@ Static Build Additional Dependencies: ldns 1.6.17 or later, expat 1.1 or later,
**Basic Process:**
* To build, change to the root of the source code directory, and run `make`.
-* The resulting executables can be found in `build/release/src` or `build/debug/src`, depending on what you're building.
+* The resulting executables can be found in `build/release/bin` or `build/debug/bin`, depending on what you're building.
**Advanced options:**
* Parallel build: run `make -j<number of threads>` instead of `make`.
* Statically linked release build: run `make release-static`.
-* Debug build: run `make build-debug`.
-* Test suite: run `make test-release` to run tests in addition to building. Running `make test-debug` will do the same to the debug version.
+* Debug build: run `make debug`.
+* Test suite: run `make release-test` to run tests in addition to building. Running `make debug-test` will do the same to the debug version.
* Building with Clang: it may be possible to use Clang instead of GCC, but this may not work everywhere. To build, run `export CC=clang CXX=clang++` before running `make`.
### On OS X:
@@ -111,7 +111,7 @@ cmake -G "MSYS Makefiles" -D CMAKE_BUILD_TYPE=Release -D CMAKE_TOOLCHAIN_FILE=..
cmake -G "MSYS Makefiles" -D CMAKE_BUILD_TYPE=Release -D CMAKE_TOOLCHAIN_FILE=../cmake/32-bit-toolchain.cmake -D MSYS2_FOLDER=c:/msys32 ..
```
* You can now run `make` to have it build
-* The resulting executables can be found in `build/release/src` or `build/debug/src`, depending on what you're building.
+* The resulting executables can be found in `build/release/bin` or `build/debug/bin`, depending on what you're building.
If you installed MSYS2 in a folder other than c:/msys64, make the appropriate substitution above.
@@ -119,8 +119,8 @@ If you installed MSYS2 in a folder other than c:/msys64, make the appropriate su
* Parallel build: run `make -j<number of threads>` instead of `make`.
* Statically linked release build: run `make release-static`.
-* Debug build: run `make build-debug`.
-* Test suite: run `make test-release` to run tests in addition to building. Running `make test-debug` will do the same to the debug version.
+* Debug build: run `make debug`.
+* Test suite: run `make release-test` to run tests in addition to building. Running `make debug-test` will do the same to the debug version.
### On FreeBSD: