From 930ac5187608126f731ba7b68cceee69461d6637 Mon Sep 17 00:00:00 2001
From: UdjinM6 <UdjinM6@users.noreply.github.com>
Date: Tue, 14 Apr 2015 11:51:14 +0300
Subject: [PATCH] Fix compiling errors on Linux. Should be ok now.

---
 src/Makefile.am        | 32 +++++++++++++++++---------------
 src/qt/walletmodel.cpp |  2 +-
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 12471a9a1..64a8c7687 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -216,20 +216,9 @@ libbitcoin_wallet_a_SOURCES = \
   $(BITCOIN_CORE_H)
 
 # crypto primitives library
+crypto_libbitcoin_crypto_a_CFLAGS = -fPIC
 crypto_libbitcoin_crypto_a_CPPFLAGS = $(BITCOIN_CONFIG_INCLUDES)
 crypto_libbitcoin_crypto_a_SOURCES = \
-  crypto/aes_helper.c \
-  crypto/luffa.c \
-  crypto/groestl.c \
-  crypto/jh.c \
-  crypto/echo.c \
-  crypto/shavite.c \
-  crypto/keccak.c \
-  crypto/skein.c \
-  crypto/bmw.c \
-  crypto/simd.c \
-  crypto/cubehash.c \
-  crypto/blake.c \
   crypto/sha1.cpp \
   crypto/sha256.cpp \
   crypto/sha512.cpp \
@@ -237,6 +226,18 @@ crypto_libbitcoin_crypto_a_SOURCES = \
   crypto/rfc6979_hmac_sha256.cpp \
   crypto/hmac_sha512.cpp \
   crypto/ripemd160.cpp \
+  crypto/aes_helper.c \
+  crypto/blake.c \
+  crypto/bmw.c \
+  crypto/cubehash.c \
+  crypto/echo.c \
+  crypto/groestl.c \
+  crypto/jh.c \
+  crypto/keccak.c \
+  crypto/luffa.c \
+  crypto/shavite.c \
+  crypto/simd.c \
+  crypto/skein.c \
   crypto/common.h \
   crypto/sha256.h \
   crypto/sha512.h \
@@ -308,6 +309,7 @@ libbitcoin_common_a_SOURCES = \
 # backward-compatibility objects and their sanity checks are linked.
 libbitcoin_util_a_CPPFLAGS = $(BITCOIN_INCLUDES)
 libbitcoin_util_a_SOURCES = \
+  allocators.cpp \
   compat/strnlen.cpp \
   compat/glibc_sanity.cpp \
   compat/glibcxx_sanity.cpp \
@@ -359,7 +361,7 @@ dashd_SOURCES += dash-res.rc
 endif
 
 dashd_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS)
-bitcoind_CPPFLAGS = $(BITCOIN_INCLUDES)
+dashd_CPPFLAGS = $(BITCOIN_INCLUDES)
 dashd_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
 
 # dash-cli binary #
@@ -373,7 +375,7 @@ dash_cli_LDADD = \
 dash_cli_SOURCES = \
   dash-cli.cpp
 
-bitcoin_cli_CPPFLAGS = $(BITCOIN_INCLUDES)
+dash_cli_CPPFLAGS = $(BITCOIN_INCLUDES)
 #
 
 # dash-tx binary #
@@ -387,7 +389,7 @@ dash_tx_LDADD = \
   $(CRYPTO_LIBS)
 
 dash_tx_SOURCES = dash-tx.cpp
-bitcoin_tx_CPPFLAGS = $(BITCOIN_INCLUDES)
+dash_tx_CPPFLAGS = $(BITCOIN_INCLUDES)
 #
 dash_tx_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
 
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
index 2bbb74a0b..c80eb8769 100644
--- a/src/qt/walletmodel.cpp
+++ b/src/qt/walletmodel.cpp
@@ -74,7 +74,7 @@ CAmount WalletModel::getBalance(const CCoinControl *coinControl) const
 }
 
 
-qint64 WalletModel::getAnonymizedBalance() const
+CAmount WalletModel::getAnonymizedBalance() const
 {
     return wallet->GetAnonymizedBalance();
 }