From 9b490f71b00227ceb9a32bb0b44a37f489a167a0 Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Mon, 19 Sep 2011 12:40:23 +0200 Subject: put Q_OBJECT everywhere it should be (removes warnings when running lupdate) --- bitcoin-qt.pro | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'bitcoin-qt.pro') diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro index 19d7814d39..dcd3d3d40b 100644 --- a/bitcoin-qt.pro +++ b/bitcoin-qt.pro @@ -5,14 +5,7 @@ DEFINES += QT_GUI # DEFINES += SSL CONFIG += no_include_pwd -# for boost 1.37, add -mt to the boost libraries LIBS += -lssl -lcrypto -ldb_cxx -unix:!macx:LIBS += -lboost_system -lboost_filesystem -lboost_program_options -lboost_thread -macx:LIBS += -lboost_system-mt -lboost_filesystem-mt -lboost_program_options-mt -lboost_thread-mt -macx:DEFINES += __WXMAC_OSX__ MSG_NOSIGNAL=0 BOOST_FILESYSTEM_VERSION=3 -windows:LIBS += -lboost_system-mgw44-mt-1_43 -lboost_filesystem-mgw44-mt-1_43 -lboost_program_options-mgw44-mt-1_43 -lboost_thread-mgw44-mt-1_43 -lws2_32 -lgdi32 -windows:DEFINES += __WXMSW__ -windows:RC_FILE = src/qt/res/bitcoin-qt.rc # use: qmake "USE_UPNP=1" # miniupnpc (http://miniupnp.free.fr/files/) must be installed @@ -22,6 +15,7 @@ count(USE_UPNP, 1) { LIBS += -lminiupnpc } +# use: qmake "USE_DBUS=1" count(USE_DBUS, 1) { message(Building with DBUS (Freedesktop notifications) support) DEFINES += QT_DBUS @@ -176,6 +170,15 @@ TRANSLATIONS = src/qt/locale/bitcoin_nl.ts src/qt/locale/bitcoin_de.ts \ OTHER_FILES += \ README.rst +# Platform-specific libraries/includes +# for boost 1.37, add -mt to the boost libraries +unix:!macx:LIBS += -lboost_system -lboost_filesystem -lboost_program_options -lboost_thread +macx:LIBS += -lboost_system-mt -lboost_filesystem-mt -lboost_program_options-mt -lboost_thread-mt +macx:DEFINES += __WXMAC_OSX__ MSG_NOSIGNAL=0 BOOST_FILESYSTEM_VERSION=3 +windows:LIBS += -lboost_system-mgw44-mt-1_43 -lboost_filesystem-mgw44-mt-1_43 -lboost_program_options-mgw44-mt-1_43 -lboost_thread-mgw44-mt-1_43 -lws2_32 -lgdi32 +windows:DEFINES += __WXMSW__ +windows:RC_FILE = src/qt/res/bitcoin-qt.rc + # For use with MacPorts macx:INCLUDEPATH += /opt/local/include /opt/local/include/db48 macx:LIBS += -L/opt/local/lib -L/opt/local/lib/db48 -- cgit v1.2.3