From f02a8e3d45be7b559c0e282585970b8887525fca Mon Sep 17 00:00:00 2001 From: "Shawn M." Date: Mon, 2 Sep 2024 13:28:35 -0700 Subject: [PATCH] Update litedoge-qt.pro --- litedoge-qt.pro | 71 ++++++++++++++++++++++++++++--------------------- 1 file changed, 41 insertions(+), 30 deletions(-) diff --git a/litedoge-qt.pro b/litedoge-qt.pro index 0f1d682..828ae04 100644 --- a/litedoge-qt.pro +++ b/litedoge-qt.pro @@ -7,6 +7,10 @@ DEFINES += ENABLE_WALLET DEFINES += BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE BOOST_BIND_GLOBAL_PLACEHOLDERS CONFIG += no_include_pwd CONFIG += thread +UPSTREAM_PATH = ./upstream + UPSTREAM_INCLUDE_PATH = $$UPSTREAM_PATH/include + UPSTREAM_LIB_PATH = $$UPSTREAM_PATH/lib + win32 { CONFIG += release } else { @@ -16,7 +20,8 @@ CONFIG += static greaterThan(QT_MAJOR_VERSION, 4) { QT += widgets - QT_DISABLE_DEPRECATED_BEFORE=0 + + DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 } else { QT += webkit } @@ -420,46 +425,47 @@ TSQM.commands = $$QMAKE_LRELEASE ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_OUT} TSQM.CONFIG = no_link QMAKE_EXTRA_COMPILERS += TSQM -# "Other files" to show in Qt Creator -OTHER_FILES += \ - doc/*.rst doc/*.txt doc/README README.md res/bitcoin-qt.rc +windows:DEFINES += WIN32 +windows:RC_FILE = + $$PWD/src/qt/res/bitcoin-qt.rc # platform specific defaults, if not overridden on command line isEmpty(BOOST_LIB_SUFFIX) { macx:BOOST_LIB_SUFFIX = -mt - windows:BOOST_LIB_SUFFIX = -mgw44-mt-1_53 + windows:BOOST_LIB_SUFFIX = -mt -mgw44-mt-1_53 } isEmpty(BOOST_THREAD_LIB_SUFFIX) { - BOOST_THREAD_LIB_SUFFIX = $$BOOST_LIB_SUFFIX + win32:BOOST_THREAD_LIB_SUFFIX = $$BOOST_LIB_SUFFIX + else:BOOST_THREAD_LIB_SUFFIX = $$BOOST_LIB_SUFFIX } isEmpty(BDB_LIB_PATH) { - macx:BDB_LIB_PATH = "/usr/local/opt/berkeley-db@4/lib" + macx:BDB_LIB_PATH = /opt/local/lib/db60 } isEmpty(BDB_LIB_SUFFIX) { - macx:BDB_LIB_SUFFIX = -4.8 + macx:BDB_LIB_SUFFIX = 6.0 } isEmpty(BDB_INCLUDE_PATH) { - macx:BDB_INCLUDE_PATH = "/usr/local/opt/berkeley-db@4/include/" + macx:BDB_INCLUDE_PATH = /opt/local/include/db60 } isEmpty(BOOST_LIB_PATH) { - macx:BOOST_LIB_PATH = "/usr/local/opt/boost@1.55/lib/" + macx:BOOST_LIB_PATH = /opt/local/lib } isEmpty(BOOST_INCLUDE_PATH) { - macx:BOOST_INCLUDE_PATH = "/usr/local/opt/boost@1.55/include" + macx:BOOST_INCLUDE_PATH = /opt/local/include } isEmpty(OPENSSL_LIB_PATH) { - macx:OPENSSL_LIB_PATH = /usr/local/opt/openssl/lib + macx:OPENSSL_LIB_PATH = /opt/local/lib } isEmpty(OPENSSL_INCLUDE_PATH) { - macx:OPENSSL_INCLUDE_PATH = /usr/local/opt/openssl/include + macx:OPENSSL_INCLUDE_PATH = /opt/local/include } isEmpty(MINIUPNPC_LIB_PATH) { @@ -477,9 +483,6 @@ isEmpty(QRENCODE_INCLUDE_PATH) { macx:QRENCODE_INCLUDE_PATH = /usr/local/Cellar/qrencode/4.0.0/include } -windows:DEFINES += WIN32 -windows:RC_FILE = src/qt/res/bitcoin-qt.rc - windows:!contains(MINGW_THREAD_BUGFIX, 0) { # At least qmake's win32-g++-cross profile is missing the -lmingwthrd # thread-safety flag. GCC has -mthreads to enable this, but it doesn't @@ -491,29 +494,42 @@ windows:!contains(MINGW_THREAD_BUGFIX, 0) { QMAKE_LIBS_QT_ENTRY = -lmingwthrd $$QMAKE_LIBS_QT_ENTRY } +!windows:!macx { + DEFINES += LINUX + LIBS += -lrt -ldl +} -macx:HEADERS += src/qt/macdockiconhandler.h src/qt/macnotificationhandler.h -macx:OBJECTIVE_SOURCES += src/qt/macdockiconhandler.mm src/qt/macnotificationhandler.mm +macx:HEADERS += src/qt/macdockiconhandler.h \ + src/qt/macnotificationhandler.h +macx:OBJECTIVE_SOURCES += src/qt/macdockiconhandler.mm \ + src/qt/macnotificationhandler.mm macx:LIBS += -framework Foundation -framework ApplicationServices -framework AppKit + $$BDB_LIB_PATH/libdb_cxx.a \ + $$BOOST_LIB_PATH/libboost_system-mt.a \ + $$BOOST_LIB_PATH/libboost_filesystem-mt.a \ + $$BOOST_LIB_PATH/libboost_program_options-mt.a \ + $$BOOST_LIB_PATH/libboost_thread-mt.a \ + $$BOOST_LIB_PATH/libboost_chrono-mt.a macx:DEFINES += MAC_OSX MSG_NOSIGNAL=0 macx:ICON = src/qt/res/icons/bitcoin.icns +macx:QMAKE_INFO_PLIST = share/qt/Info.plist +# osx 10.9 has changed the stdlib default to libc++. To prevent some link error, you may need to use libstdc++ + QMAKE_CXXFLAGS += -stdlib=libstdc++ macx:TARGET = "LiteDoge-Qt" macx:QMAKE_CFLAGS_THREAD += -pthread macx:QMAKE_LFLAGS_THREAD += -pthread macx:QMAKE_CXXFLAGS_THREAD += -pthread -macx:QMAKE_INFO_PLIST = share/qt/Info.plist + # 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 +=$$UPSTREAM_INCLUDE_PATH $$BOOST_INCLUDE_PATH $$BDB_INCLUDE_PATH $$OPENSSL_INCLUDE_PATH $$QRENCODE_INCLUDE_PATH +LIBS += $$join(UPSTREAM_LIB_PATH,,-L,) $$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 -lz # -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 -lboost_chrono$$BOOST_LIB_SUFFIX -ldl windows:LIBS += -lboost_chrono$$BOOST_LIB_SUFFIX - - contains(RELEASE, 1) { !windows:!macx { # Linux: turn dynamic linking back on for c/c++ runtime libraries @@ -521,9 +537,4 @@ contains(RELEASE, 1) { } } -!windows:!macx { - DEFINES += LINUX - LIBS += -lrt -ldl -} - -system($$QMAKE_LRELEASE -silent) +system($$QMAKE_LRELEASE -silent $$_PRO_FILE_)