diff --git a/nyancoin-qt.pro b/nyancoin-qt.pro index 9e2e76e..f7d7b93 100644 --- a/nyancoin-qt.pro +++ b/nyancoin-qt.pro @@ -6,12 +6,15 @@ DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE BOOST_THREAD_PROV CONFIG += no_include_pwd QT += widgets -#CONFIG += c++11 macx:BDB_LIB_PATH = /usr/local/opt/berkeley-db4/lib macx:BDB_INCLUDE_PATH = /usr/local/opt/berkeley-db4/include -macx:BOOST_INCLUDE_PATH=/Users/jamescoxon/Development/boost_1_60_0 +macx:BOOST_INCLUDE_PATH=/usr/local/include/boost. macx:BOOST_LIB_PATH=/usr/local/lib +macx:QMAKE_CXXFLAGS += -Wno-deprecated-declarations +macx:QMAKE_MAC_SDK = macosx10.11 +macx:OPENSSL_LIB_PATH += /usr/local/opt/openssl/lib +macx:OPENSSL_INCLUDE_PATH += /usr/local/opt/openssl/include # UNCOMMENT THIS SECTION TO BUILD ON WINDOWS @@ -40,7 +43,7 @@ UI_DIR = build # use: qmake "RELEASE=1" contains(RELEASE, 1) { # Mac: compile for maximum compatibility (10.5, 32-bit) - macx:QMAKE_CXXFLAGS += -mmacosx-version-min=10.5 -arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk + macx:QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -arch i386 -isysroot /Developer/SDKs/MacOSX10.7.sdk -Wno-deprecated-declarations !windows:!macx { # Linux: static link diff --git a/src/db.cpp b/src/db.cpp index 9d2d9d8..27feed7 100644 --- a/src/db.cpp +++ b/src/db.cpp @@ -346,7 +346,7 @@ void CDBEnv::Flush(bool fShutdown) else mi++; } - printf("DBFlush(%s)%s ended %15"PRI64d"ms\n", fShutdown ? "true" : "false", fDbEnvInit ? "" : " db not started", GetTimeMillis() - nStart); + printf("DBFlush(%s)%s ended %15" PRI64d"ms\n", fShutdown ? "true" : "false", fDbEnvInit ? "" : " db not started", GetTimeMillis() - nStart); if (fShutdown) { char** listp; diff --git a/src/init.cpp b/src/init.cpp index 70b8bac..1593336 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -589,7 +589,7 @@ bool AppInit2() printf("Shutdown requested. Exiting.\n"); return false; } - printf(" block index %15"PRI64d"ms\n", GetTimeMillis() - nStart); + printf(" block index %15" PRI64d"ms\n", GetTimeMillis() - nStart); if (GetBoolArg("-printblockindex") || GetBoolArg("-printblocktree")) { @@ -700,7 +700,7 @@ bool AppInit2() } printf("%s", strErrors.str().c_str()); - printf(" wallet %15"PRI64d"ms\n", GetTimeMillis() - nStart); + printf(" wallet %15" PRI64d"ms\n", GetTimeMillis() - nStart); RegisterWallet(pwalletMain); @@ -720,7 +720,7 @@ bool AppInit2() printf("Rescanning last %i blocks (from block %i)...\n", pindexBest->nHeight - pindexRescan->nHeight, pindexRescan->nHeight); nStart = GetTimeMillis(); pwalletMain->ScanForWalletTransactions(pindexRescan, true); - printf(" rescan %15"PRI64d"ms\n", GetTimeMillis() - nStart); + printf(" rescan %15" PRI64d"ms\n", GetTimeMillis() - nStart); } // ********************************************************* Step 8: import blocks @@ -747,7 +747,7 @@ bool AppInit2() printf("Invalid or missing peers.dat; recreating\n"); } - printf("Loaded %i addresses from peers.dat %"PRI64d"ms\n", + printf("Loaded %i addresses from peers.dat %" PRI64d"ms\n", addrman.size(), GetTimeMillis() - nStart); // ********************************************************* Step 10: start node diff --git a/src/net.cpp b/src/net.cpp index 0cc8f7d..3a153db 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -1080,7 +1080,7 @@ void DumpAddresses() CAddrDB adb; adb.Write(addrman); - printf("Flushed %d addresses to peers.dat %"PRI64d"ms\n", + printf("Flushed %d addresses to peers.dat %" PRI64d"ms\n", addrman.size(), GetTimeMillis() - nStart); } diff --git a/src/serialize.h b/src/serialize.h index 6e952fa..626b6d0 100644 --- a/src/serialize.h +++ b/src/serialize.h @@ -808,6 +808,7 @@ class CDataStream iterator insert(iterator it, const char& x=char()) { return vch.insert(it, x); } void insert(iterator it, size_type n, const char& x) { vch.insert(it, n, x); } +#ifndef __APPLE__ void insert(iterator it, const_iterator first, const_iterator last) { assert(last - first >= 0); @@ -820,6 +821,7 @@ class CDataStream else vch.insert(it, first, last); } +#endif void insert(iterator it, std::vector::const_iterator first, std::vector::const_iterator last) { diff --git a/src/walletdb.cpp b/src/walletdb.cpp index 4fa3cfd..0ad71d4 100644 --- a/src/walletdb.cpp +++ b/src/walletdb.cpp @@ -376,7 +376,7 @@ void ThreadFlushWalletDB(void* parg) bitdb.CheckpointLSN(strFile); bitdb.mapFileUseCount.erase(mi++); - printf("Flushed wallet.dat %"PRI64d"ms\n", GetTimeMillis() - nStart); + printf("Flushed wallet.dat %" PRI64d"ms\n", GetTimeMillis() - nStart); } } }