From 6ccff2cbdebca38e4913b679784a4865edfbb12a Mon Sep 17 00:00:00 2001 From: Nils Schneider Date: Tue, 27 Sep 2011 20:16:07 +0200 Subject: remove cryptopp dependency, add simple unittest for SHA256Transform() --- bitcoin-qt.pro | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'bitcoin-qt.pro') diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro index 2d9cdc7ef5..9b2a193acc 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 @@ -45,7 +45,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 \ @@ -60,17 +60,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 \ @@ -126,8 +115,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 \ -- cgit v1.2.3 From 6853e627f12de21b38a178def14c067435517d96 Mon Sep 17 00:00:00 2001 From: Gavin Andresen Date: Fri, 7 Oct 2011 11:02:21 -0400 Subject: Fix build on windows and mac Replaced all occurrences of #if* __WXMSW__ with WIN32, and all occurrences of __WXMAC_OSX__ with MAC_OSX, and made sure those are defined appropriately in the makefile and bitcoin-qt.pro. --- bitcoin-qt.pro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bitcoin-qt.pro') diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro index 9b2a193acc..6b1fb7f6cf 100644 --- a/bitcoin-qt.pro +++ b/bitcoin-qt.pro @@ -211,10 +211,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" -- cgit v1.2.3