Improved Mac experience; QDoubleSpinBox for BitcoinAmountField

[novacoin.git] / bitcoin-qt.pro

diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro
index 2d9cdc7..5b9d748 100644 (file)
--- 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
 
@@ -16,10 +16,17 @@ OBJECTS_DIR = build
 MOC_DIR = build
 UI_DIR = build
 
-# use: qmake "USE_UPNP=0" (disable by default) or "USE_UPNP=1" (enable by default)
-# miniupnpc (http://miniupnp.free.fr/files/) must be installed
-count(USE_UPNP, 1) {
+# use: qmake "USE_UPNP=1" ( enabled by default; default)
+#  or: qmake "USE_UPNP=0" (disabled by default)
+#  or: qmake "USE_UPNP=-" (not supported)
+# miniupnpc (http://miniupnp.free.fr/files/) must be installed for support
+contains(USE_UPNP, -) {
+    message(Building without UPNP support)
+} else {
     message(Building with UPNP support)
+    count(USE_UPNP, 0) {
+        USE_UPNP=1
+    }
     DEFINES += USE_UPNP=$$USE_UPNP
     LIBS += -lminiupnpc
 }
@@ -32,7 +39,7 @@ contains(USE_DBUS, 1) {
 }
 
 # use: qmake "USE_SSL=1"
-contains(USE_DBUS, 1) {
+contains(USE_SSL, 1) {
     message(Building with SSL support for RPC)
     DEFINES += USE_SSL
 }
@@ -45,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 \
@@ -60,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 \
@@ -126,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 \
@@ -224,10 +218,13 @@ 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:HEADERS += src/qt/macdockiconhandler.h
+macx:OBJECTIVE_SOURCES += src/qt/macdockiconhandler.mm
+macx:LIBS += -framework Foundation -framework ApplicationServices -framework AppKit
+macx:DEFINES += MAC_OSX MSG_NOSIGNAL=0 BOOST_FILESYSTEM_VERSION=3
 macx:ICON = src/qt/res/icons/bitcoin.icns
 macx:TARGET = "Bitcoin Qt"