Merge pull request #14 from ltanyc/macos

OSX wallet updates
NewYorkCoin-NYC · Feb 12, 2018 · 1538ac0 · 1538ac0
2 parents ee500eb + 3a55c51
commit 1538ac0
Show file tree

Hide file tree

Showing 30 changed files with 22 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,3 @@
 docker/data/
+src/newyorkcd
+src/obj/*.o
diff --git a/newyorkc-qt.pro b/newyorkc-qt.pro
@@ -35,9 +35,9 @@ 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_CFLAGS += -mmacosx-version-min=10.5 -arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk
-    macx:QMAKE_LFLAGS += -mmacosx-version-min=10.5 -arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk
+    macx:QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -arch i386 -isysroot /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
+    macx:QMAKE_CFLAGS += -mmacosx-version-min=10.7 -arch i386 -isysroot /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
+    macx:QMAKE_LFLAGS += -mmacosx-version-min=10.7 -arch i386 -isysroot /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
     !windows:!macx {
         # Linux: static link
         LIBS += -Wl,-Bstatic
@@ -307,31 +307,31 @@ isEmpty(BOOST_THREAD_LIB_SUFFIX) {
 }
 
 isEmpty(BDB_LIB_PATH) {
-    macx:BDB_LIB_PATH = /usr/local/Cellar/berkeley-db/5.3.21/lib/
+    macx:BDB_LIB_PATH = /usr/local/Cellar/berkeley-db/5.3.28/lib/
 }
 
 isEmpty(BDB_LIB_SUFFIX) {
     macx:BDB_LIB_SUFFIX = -5.3
 }
 
 isEmpty(BDB_INCLUDE_PATH) {
-    macx:BDB_INCLUDE_PATH = /usr/local/Cellar/berkeley-db/5.3.21/include/
+    macx:BDB_INCLUDE_PATH = /usr/local/Cellar/berkeley-db/5.3.28/include/
 }
 
 isEmpty(BOOST_LIB_PATH) {
-    macx:BOOST_LIB_PATH = /usr/local/Cellar/boost/1.55.0/lib/
+    macx:BOOST_LIB_PATH = /usr/local/Cellar/boost@1.55/1.55.0_1/lib/
 }
 
 isEmpty(BOOST_INCLUDE_PATH) {
-    macx:BOOST_LIB_PATH = /usr/local/Cellar/boost/1.55.0/include/
+    macx:BOOST_INCLUDE_PATH = /usr/local/Cellar/boost@1.55/1.55.0_1/include/
 }
 
 isEmpty(OPENSSL_INCLUDE_PATH) {
-    macx:OPENSSL_INCLUDE_PATH = /usr/local/Cellar/openssl/1.0.1f/include/
+    macx:OPENSSL_INCLUDE_PATH = /usr/local/Cellar/openssl/1.0.2n/include/
 }
 
 isEmpty(OPENSSL_LIB_PATH) {
-    macx:OPENSSL_LIB_PATH = /usr/local/Cellar/openssl/1.0.1f/lib/
+    macx:OPENSSL_LIB_PATH = /usr/local/Cellar/openssl/1.0.2n/lib/
 }
 
 windows:LIBS += -lws2_32 -lshlwapi -lmswsock
@@ -376,4 +376,5 @@ contains(RELEASE, 1) {
     }
 }
 
-system($$QMAKE_LRELEASE -silent $$_PRO_FILE_)
+system($$QMAKE_LRELEASE -silent $$_PRO_FILE_)
+
diff --git a/src/makefile.osx b/src/makefile.osx
@@ -9,11 +9,15 @@ CXX=llvm-g++
 DEPSDIR=/usr/local
 
 INCLUDEPATHS= \
+ -I/usr/local/opt/openssl/include \
+ -I/usr/local/opt/berkeley-db/include \
  -I"$(CURDIR)" \
  -I"$(CURDIR)"/obj \
  -I"$(DEPSDIR)/include"
 
 LIBPATHS= \
+ -L/usr/local/opt/openssl/lib \
+ -L/usr/local/opt/berkeley-db/lib \
  -L"$(DEPSDIR)/lib"
 
 USE_UPNP:=1

diff --git a/src/net.cpp b/src/net.cpp
@@ -1032,10 +1032,14 @@ void ThreadMapPort2(void* parg)
 #ifndef UPNPDISCOVER_SUCCESS
     /* miniupnpc 1.5 */
     devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0);
-#else
+#elif MINIUPNPC_API_VERSION < 14
     /* miniupnpc 1.6 */
     int error = 0;
     devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0, 0, &error);
+#else
+    /* miniupnpc 1.9 */
+    int error = 0;
+    devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0, 0, 2, &error);
 #endif
 
     struct UPNPUrls urls;

diff --git a/src/newyorkcd b/src/newyorkcd
diff --git a/src/obj/addrman.o b/src/obj/addrman.o
diff --git a/src/obj/bitcoinrpc.o b/src/obj/bitcoinrpc.o
diff --git a/src/obj/checkpoints.o b/src/obj/checkpoints.o
diff --git a/src/obj/crypter.o b/src/obj/crypter.o
diff --git a/src/obj/db.o b/src/obj/db.o
diff --git a/src/obj/init.o b/src/obj/init.o
diff --git a/src/obj/irc.o b/src/obj/irc.o
diff --git a/src/obj/key.o b/src/obj/key.o
diff --git a/src/obj/keystore.o b/src/obj/keystore.o
diff --git a/src/obj/main.o b/src/obj/main.o
diff --git a/src/obj/net.o b/src/obj/net.o
diff --git a/src/obj/netbase.o b/src/obj/netbase.o
diff --git a/src/obj/noui.o b/src/obj/noui.o
diff --git a/src/obj/protocol.o b/src/obj/protocol.o
diff --git a/src/obj/rpcdump.o b/src/obj/rpcdump.o
diff --git a/src/obj/rpcnet.o b/src/obj/rpcnet.o
diff --git a/src/obj/rpcrawtransaction.o b/src/obj/rpcrawtransaction.o
diff --git a/src/obj/script.o b/src/obj/script.o
diff --git a/src/obj/scrypt.o b/src/obj/scrypt.o
diff --git a/src/obj/sync.o b/src/obj/sync.o
diff --git a/src/obj/util.o b/src/obj/util.o
diff --git a/src/obj/version.o b/src/obj/version.o
diff --git a/src/obj/wallet.o b/src/obj/wallet.o
diff --git a/src/obj/walletdb.o b/src/obj/walletdb.o
diff --git a/src/qt/res/icons/bitcoin.icns b/src/qt/res/icons/bitcoin.icns