diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-10-09 20:26:40 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-10-09 20:26:40 +0200 |
| commit | 8828da5f56313855e19f463ff1c09196812b997b (patch) | |
| tree | e54e27b1a7d5287bbe245189c3044cc1a19ba02b /bitcoin-qt.pro | |
| parent | ba2db7262bec34d45c75c6842c3a1c0cfaba893e (diff) | |
| parent | 4db9705dd839cbb386398b1eb4be2a67357c27c4 (diff) | |
| download | bitcoin-8828da5f56313855e19f463ff1c09196812b997b.tar.xz | |
Merge branch 'master' of https://github.com/bitcoin/bitcoin
Diffstat (limited to 'bitcoin-qt.pro')
| -rw-r--r-- | bitcoin-qt.pro | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro index a603549720..1f65d0574f 100644 --- a/bitcoin-qt.pro +++ b/bitcoin-qt.pro @@ -1,6 +1,6 @@ TEMPLATE = app TARGET = -INCLUDEPATH += src src/json src/cryptopp src/qt +INCLUDEPATH += src src/json src/qt DEFINES += QT_GUI CONFIG += no_include_pwd @@ -52,7 +52,7 @@ QMAKE_LFLAGS += -fstack-protector QMAKE_CXXFLAGS_WARN_ON = -fdiagnostics-show-option -Wall -Wno-invalid-offsetof -Wno-unused-variable -Wno-unused-parameter -Wno-sign-compare -Wno-char-subscripts -Wno-unused-value -Wno-sequence-point -Wno-parentheses -Wno-unknown-pragmas -Wno-switch # Input -DEPENDPATH += src/qt src src/cryptopp src json/include +DEPENDPATH += src/qt src src json/include HEADERS += src/qt/bitcoingui.h \ src/qt/transactiontablemodel.h \ src/qt/addresstablemodel.h \ @@ -67,17 +67,6 @@ HEADERS += src/qt/bitcoingui.h \ src/util.h \ src/uint256.h \ src/serialize.h \ - src/cryptopp/stdcpp.h \ - src/cryptopp/smartptr.h \ - src/cryptopp/simple.h \ - src/cryptopp/sha.h \ - src/cryptopp/secblock.h \ - src/cryptopp/pch.h \ - src/cryptopp/misc.h \ - src/cryptopp/iterhash.h \ - src/cryptopp/cryptlib.h \ - src/cryptopp/cpu.h \ - src/cryptopp/config.h \ src/strlcpy.h \ src/main.h \ src/net.h \ @@ -133,8 +122,6 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \ src/qt/aboutdialog.cpp \ src/qt/editaddressdialog.cpp \ src/qt/bitcoinaddressvalidator.cpp \ - src/cryptopp/sha.cpp \ - src/cryptopp/cpu.cpp \ src/util.cpp \ src/script.cpp \ src/main.cpp \ @@ -231,10 +218,10 @@ isEmpty(BOOST_INCLUDE_PATH) { } windows:LIBS += -lws2_32 -lgdi32 -windows:DEFINES += __WXMSW__ +windows:DEFINES += WIN32 windows:RC_FILE = src/qt/res/bitcoin-qt.rc -macx:DEFINES += __WXMAC_OSX__ MSG_NOSIGNAL=0 BOOST_FILESYSTEM_VERSION=3 +macx:DEFINES += MAC_OSX MSG_NOSIGNAL=0 BOOST_FILESYSTEM_VERSION=3 macx:ICON = src/qt/res/icons/bitcoin.icns macx:TARGET = "Bitcoin Qt" |