Changed the order in which the header files were being included. Due to the nan header using the system version of endian.h, but the bitcoin-related headers need the compat/endian.h. The two (at least on Linux) are not compatible.
This commit is contained in:
parent
5d9338d22a
commit
36e3343432
@ -1,11 +1,7 @@
|
|||||||
language: node_js
|
language: node_js
|
||||||
sudo: false
|
|
||||||
node_js:
|
node_js:
|
||||||
- "0.12"
|
- "0.12"
|
||||||
addons:
|
|
||||||
apt:
|
|
||||||
packages:
|
|
||||||
- libboost-all-dev
|
|
||||||
before_install:
|
before_install:
|
||||||
|
- sudo apt-get install libboost1.48-all-dev
|
||||||
- git config --global user.email "dev@bitpay.com"
|
- git config --global user.email "dev@bitpay.com"
|
||||||
- git config --global user.name "BitPay, Inc."
|
- git config --global user.name "BitPay, Inc."
|
||||||
|
|||||||
@ -2,11 +2,11 @@
|
|||||||
'targets': [{
|
'targets': [{
|
||||||
'target_name': 'bitcoindjs',
|
'target_name': 'bitcoindjs',
|
||||||
'include_dirs' : [
|
'include_dirs' : [
|
||||||
|
'<!(node -e "require(\'nan\')")',
|
||||||
'/usr/include/boost',
|
'/usr/include/boost',
|
||||||
'/usr/local/include',
|
'/usr/local/include',
|
||||||
'./libbitcoind/src/leveldb/include',
|
'./libbitcoind/src/leveldb/include',
|
||||||
'./libbitcoind/src',
|
'./libbitcoind/src',
|
||||||
'<!(node -e "require(\'nan\')")'
|
|
||||||
],
|
],
|
||||||
'sources': [
|
'sources': [
|
||||||
'./src/bitcoindjs.cc',
|
'./src/bitcoindjs.cc',
|
||||||
|
|||||||
@ -6,8 +6,6 @@
|
|||||||
* A bitcoind node.js binding header file.
|
* A bitcoind node.js binding header file.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "nan.h"
|
|
||||||
#include "scheduler.h"
|
|
||||||
#include "main.h"
|
#include "main.h"
|
||||||
#include "addrman.h"
|
#include "addrman.h"
|
||||||
#include "alert.h"
|
#include "alert.h"
|
||||||
@ -18,6 +16,8 @@
|
|||||||
#include "txdb.h"
|
#include "txdb.h"
|
||||||
#include <boost/thread.hpp>
|
#include <boost/thread.hpp>
|
||||||
#include <boost/filesystem.hpp>
|
#include <boost/filesystem.hpp>
|
||||||
|
#include "nan.h"
|
||||||
|
#include "scheduler.h"
|
||||||
|
|
||||||
NAN_METHOD(StartBitcoind);
|
NAN_METHOD(StartBitcoind);
|
||||||
NAN_METHOD(OnBlocksReady);
|
NAN_METHOD(OnBlocksReady);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user