Skip to content

Commit

Permalink
New checkpoints added and fixed some warnings warnings at macOS build
Browse files Browse the repository at this point in the history
  • Loading branch information
furiousteam committed Dec 11, 2018
1 parent 21ff01b commit 7bc3e05
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 15 deletions.
Binary file removed BLOC-V3.tar.gz
Binary file not shown.
46 changes: 33 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,34 +109,54 @@ The binaries will be in the `src` folder when you are complete.
- `cd src`
- `./BLOCd --version`

#### Apple
#### OSX/Apple, using GCC

##### Prerequisites

- Install [cmake](https://cmake.org/). See [here](https://stackoverflow.com/questions/23849962/cmake-installer-for-mac-fails-to-create-usr-bin-symlinks) if you are unable to call `cmake` from the terminal after installing.
- Install the [boost](http://www.boost.org/) libraries. Either compile boost manually or run `brew install boost`.
- Install XCode and Developer Tools.


##### Building

- `which brew || /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"`
- `brew install --force cmake boost llvm gcc@8`
- `export CC=gcc-8`
- `export CXX=g++-8`
- `git clone -b master --single-branch https://github.com/furiousteam/BLOC`
- `cd bloc`
- `mkdir build && cd $_`
- `cmake ..` or `cmake -DBOOST_ROOT=<path_to_boost_install> ..` when building
from a specific boost install. If you used brew to install boost, your path is most likely `/usr/local/include/boost.`
- `cd BLOC`
- `mkdir build`
- `cd build`
- `cmake ..`
- `make`

The binaries will be in the `src` folder when you are complete.

- `cd src`
- `./BLOCd --version`

If your version of gcc is too old, you may need to run:
#### OSX/Apple, using Clang

##### Prerequisites

- Install XCode and Developer Tools.

##### Building

- `which brew || /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"`
- `brew install --force cmake boost llvm`
- `export CC=/usr/local/opt/llvm/bin/clang`
- `export CXX=/usr/local/opt/llvm/bin/clang++`
- `git clone -b master --single-branch https://github.com/furiousteam/BLOC`
- `cd BLOC`
- `mkdir build`
- `cd build`
- `cmake ..`
- `make`

The binaries will be in the `src` folder when you are complete.

- `cd src`
- `./BLOCd --version`

- `brew install gcc@8`
- `export CC=gcc-8`
- `export CXX=g++-8`

#### Windows

Expand Down Expand Up @@ -201,4 +221,4 @@ Hi BLOC contributor, thanks for forking and sending back Pull Requests. Extensiv
// Copyright (c) 2018, The BLOC Developers
//
// Please see the included LICENSE file for more information.
```
```
5 changes: 4 additions & 1 deletion src/config/CryptoNoteCheckpoints.h
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ const std::initializer_list<CheckpointData> CHECKPOINTS = {
{ 115000, "622fbdfa3de5a5797a225b1aa11f7d6b8e23a16b20a5f63048a0e2a1d9681cc6"},
{ 120000, "f7ff98e74a49e4c1f377f3e74b758e5a666fd007ddaf8e28ff9524a38d0d3be1"},
{ 125000, "ee04293cc69b2eff64a289626aab4d2474ce40a79163ee0712f4b531b89c22da"},
{ 130000, "e2f555027a78675e7b174d55bf65f31cfdb51cd841cd8cf82bf8f9a15a577f1c"}
{ 130000, "e2f555027a78675e7b174d55bf65f31cfdb51cd841cd8cf82bf8f9a15a577f1c"},
{ 131214, "51807d967e9a26c6fc1286e25b1742907370ac19e484682125fcf49792c68bf1"},
{ 131938, "ee7f170ed839628592b6cb6b319780f5da7e7d10e5563285c77520beb7e32f86"},
{ 135000, "708c35534109a03f3b5cedbceabe091e98bf13ee82141c3b1ba463b1635df92b"}
};
}
2 changes: 1 addition & 1 deletion src/crypto/cn_slow_hash.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
#if defined(__x86_64__) || defined(__i386__) || defined(_M_X86) || defined(_M_X64)
#ifdef __GNUC__
#include <x86intrin.h>
#pragma GCC target ("aes")
//#pragma GCC target ("aes")
#if !defined(HAS_WIN_INTRIN_API)
#include <cpuid.h>
#endif // !defined(HAS_WIN_INTRIN_API)
Expand Down

0 comments on commit 7bc3e05

Please sign in to comment.