X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=blobdiff_plain;f=novacoin-qt.pro;h=9bd8990e31732eb59fb000393e68554c724108a9;hp=16277f72ebe5cbc612471e3edd16abc34fad7451;hb=ef17ac0211ddd486127e1f94756fbb3fd704a9b4;hpb=b8185c9d52c544919cdf81958b0956abbc258662

diff --git a/novacoin-qt.pro b/novacoin-qt.pro
index 16277f7..9bd8990 100644
--- a/novacoin-qt.pro
+++ b/novacoin-qt.pro
@@ -23,7 +23,7 @@ win32-g++-cross: QMAKE_TARGET.arch = $$TARGET_PLATFORM
 # use: qmake BOOST_LIB_SUFFIX=-mt
 # for boost thread win32 with _win32 sufix
 # use: BOOST_THREAD_LIB_SUFFIX=_win32-...
-# or when linking against a specific BerkelyDB version: BDB_LIB_SUFFIX=-6.1
+# or when linking against a specific BerkelyDB version: BDB_LIB_SUFFIX=-6.0
 
 # Dependency library locations can be customized with:
 #    BOOST_INCLUDE_PATH, BOOST_LIB_PATH, BDB_INCLUDE_PATH,
@@ -39,6 +39,9 @@ win32-g++-cross: QMAKE_TARGET.arch = $$TARGET_PLATFORM
 #QRENCODE_INCLUDE_PATH=C:/deps/qrencode-3.4.4
 #QRENCODE_LIB_PATH=C:/deps/qrencode-3.4.4/.libs
 
+IXWEBSOCKET_INCLUDE_PATH=$$PWD/src/additional/stage/usr/include
+IXWEBSOCKET_LIB_PATH=$$PWD/src/additional/stage/usr/lib
+
 OBJECTS_DIR = build
 MOC_DIR = build
 UI_DIR = build
@@ -426,7 +429,7 @@ isEmpty(BOOST_THREAD_LIB_SUFFIX) {
 }
 
 isEmpty(BDB_LIB_PATH) {
-    macx:BDB_LIB_PATH = /usr/local/BerkeleyDB.6.1/lib
+    macx:BDB_LIB_PATH = /opt/local/lib/db60
 }
 
 isEmpty(OPENSSL_LIB_PATH) {
@@ -446,11 +449,11 @@ isEmpty(OPENSSL_INCLUDE_PATH) {
 }
 
 isEmpty(BOOST_LIB_PATH) {
-    macx:BOOST_LIB_PATH = /opt/local/lib
+    macx:BOOST_LIB_PATH = /usr/local/opt/boost@1.60/lib
 }
 
 isEmpty(BOOST_INCLUDE_PATH) {
-    macx:BOOST_INCLUDE_PATH = /opt/local/include
+    macx:BOOST_INCLUDE_PATH = /usr/local/opt/boost@1.60/include
 }
 
 windows:DEFINES += WIN32
@@ -485,9 +488,9 @@ macx:QMAKE_LFLAGS_THREAD += -pthread
 macx:QMAKE_CXXFLAGS_THREAD += -pthread
 
 # Set libraries and includes at end, to use platform-defined defaults if not overridden
-INCLUDEPATH += $$BOOST_INCLUDE_PATH $$BDB_INCLUDE_PATH $$OPENSSL_INCLUDE_PATH $$QRENCODE_INCLUDE_PATH
-LIBS += $$join(BOOST_LIB_PATH,,-L,) $$join(BDB_LIB_PATH,,-L,) $$join(OPENSSL_LIB_PATH,,-L,) $$join(QRENCODE_LIB_PATH,,-L,)
-LIBS += -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX
+INCLUDEPATH += $$BOOST_INCLUDE_PATH $$BDB_INCLUDE_PATH $$OPENSSL_INCLUDE_PATH $$QRENCODE_INCLUDE_PATH $$IXWEBSOCKET_INCLUDE_PATH
+LIBS += $$join(BOOST_LIB_PATH,,-L,) $$join(BDB_LIB_PATH,,-L,) $$join(OPENSSL_LIB_PATH,,-L,) $$join(QRENCODE_LIB_PATH,,-L,)  $$join(IXWEBSOCKET_LIB_PATH,,-L,) 
+LIBS += -lssl -lcrypto -lixwebsocket -ldb_cxx$$BDB_LIB_SUFFIX
 # -lgdi32 has to happen after -lcrypto (see  #681)
 windows:LIBS += -lws2_32 -lshlwapi -lmswsock -lole32 -loleaut32 -luuid -lgdi32
 LIBS += -lboost_system$$BOOST_LIB_SUFFIX -lboost_filesystem$$BOOST_LIB_SUFFIX -lboost_program_options$$BOOST_LIB_SUFFIX -lboost_thread$$BOOST_THREAD_LIB_SUFFIX