Removed cruft.

This commit is contained in:
Chris Kleeschulte 2015-07-27 21:15:51 -04:00 committed by Chris Kleeschulte
parent 9a18d37011
commit 20bbe650c6
2 changed files with 6 additions and 8 deletions

View File

@ -3,8 +3,7 @@
'target_name': 'bitcoindjs', 'target_name': 'bitcoindjs',
'include_dirs' : [ 'include_dirs' : [
'<!(node -e "require(\'nan\')")', '<!(node -e "require(\'nan\')")',
'/usr/include/boost', '<!(./platform/os.sh depends_dir)/include/boost',
'/usr/local/include',
'./libbitcoind/src/leveldb/include', './libbitcoind/src/leveldb/include',
'./libbitcoind/src', './libbitcoind/src',
], ],

View File

@ -8,9 +8,9 @@ os=
ext=so ext=so
host=`uname -m`-`uname -a | awk '{print tolower($1)}'` host=`uname -m`-`uname -a | awk '{print tolower($1)}'`
boost_dir="${root_dir}"/libbitcoind/depends/${host}/lib depends_dir="${BITCOIN_DIR}"/depends/${host}
thread="${boost_dir}"/libboost_thread-mt.a thread="${depends_dir}"/lib/libboost_thread-mt.a
filesystem="${boost_dir}"/libboost_filesystem-mt.a filesystem="${depends_dir}"/lib/libboost_filesystem-mt.a
if test -f /etc/centos-release \ if test -f /etc/centos-release \
|| grep -q 'CentOS' /etc/redhat-release \ || grep -q 'CentOS' /etc/redhat-release \
@ -24,7 +24,6 @@ elif test -f /etc/redhat_release \
elif uname -a | grep -q '^Darwin'; then elif uname -a | grep -q '^Darwin'; then
os=osx os=osx
ext=dylib ext=dylib
boost_dir="${root_dir}"/libbitcoind/depends/x86_64-darwin/lib
elif test -f /etc/SuSE-release; then elif test -f /etc/SuSE-release; then
os=suse os=suse
elif test -f /etc/mandrake-release \ elif test -f /etc/mandrake-release \
@ -82,8 +81,8 @@ if test -z "$1" -o x"$1" = x'filesystem'; then
echo -n "${filesystem}" echo -n "${filesystem}"
fi fi
if test -z "$1" -o x"$1" = x'boost_dir'; then if test -z "$1" -o x"$1" = x'depends_dir'; then
echo -n "${boost_dir}" echo -n "${depends_dir}"
fi fi
if test -z "$1" -o x"$1" = x'host'; then if test -z "$1" -o x"$1" = x'host'; then