From 5f30e8002b8fe6f34caac2bd8b43a85138b6d33b Mon Sep 17 00:00:00 2001 From: ajochems Date: Tue, 19 Apr 2016 09:02:36 +0000 Subject: [PATCH] Updated Linux build --- src/compat.h | 3 +-- src/makefile.unix | 16 ++++++++-------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/compat.h b/src/compat.h index f4efecf..1391bc7 100644 --- a/src/compat.h +++ b/src/compat.h @@ -25,13 +25,12 @@ #include #endif -// SOCKET is defined by TDM-GCC -// typedef u_int SOCKET; #ifdef WIN32 #define MSG_NOSIGNAL 0 #define MSG_DONTWAIT 0 typedef int socklen_t; #else +typedef u_int SOCKET; #include "errno.h" #define WSAGetLastError() errno #define WSAEINVAL EINVAL diff --git a/src/makefile.unix b/src/makefile.unix index 80354ab..0e5ada9 100644 --- a/src/makefile.unix +++ b/src/makefile.unix @@ -16,16 +16,16 @@ USE_IPV6:=1 USE_QRCODE=1 # define libraries -BOOST_LIB_PATH=/home/ubuntu/deps/linux/boost_1_55_0/stage/lib -BDB_LIB_PATH=/home/ubuntu/deps/linux/db-4.8.30.NC/build_unix -OPENSSL_LIB_PATH=/home/ubuntu/deps/linux/openssl-1.0.1h -MINIUPNPC_LIB_PATH=/home/ubuntu/deps/linux/miniupnpc +BOOST_LIB_PATH=$HOME/deps/boost_1_60_0/stage/lib +BDB_LIB_PATH=$HOME/deps/db-4.8.30.NC/build_unix +OPENSSL_LIB_PATH=$HOME/deps/openssl-1.0.2g +MINIUPNPC_LIB_PATH=$HOME/deps/miniupnpc-1.9 # define includes -BOOST_INCLUDE_PATH=/home/ubuntu/deps/linux/boost_1_55_0 -BDB_INCLUDE_PATH=/home/ubuntu/deps/linux/db-4.8.30.NC/build_unix -OPENSSL_INCLUDE_PATH=/home/ubuntu/deps/linux/openssl-1.0.1h -MINIUPNPC_INCLUDE_PATH=/home/ubuntu/deps/linux +BOOST_INCLUDE_PATH=$HOME/deps/boost_1_60_0 +BDB_INCLUDE_PATH=$HOME/deps/db-4.8.30.NC/build_unix +OPENSSL_INCLUDE_PATH=$HOME/deps/openssl-1.0.2g +MINIUPNPC_INCLUDE_PATH=$HOME/deps/miniupnpc-1.9 LINK:=$(CXX)