aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2012-01-03 10:22:24 -0500
committerGavin Andresen <gavinandresen@gmail.com>2012-01-03 10:22:24 -0500
commitdaad9a9a71e9efc42e43245e374b4466dca6ebe6 (patch)
tree96ae8181f498e5ac399cf15b67956bf17fb1815a /src
parent0fcf91ea1e23697736032caadc8e487e0ba6cfef (diff)
parent0b5d6f1e26088df0aaf16b63d1268e40f5fd13b3 (diff)
downloadbitcoin-daad9a9a71e9efc42e43245e374b4466dca6ebe6.tar.xz
Merge branch 'gitianfix' of https://github.com/TheBlueMatt/bitcoin
Diffstat (limited to 'src')
-rw-r--r--src/makefile.osx5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/makefile.osx b/src/makefile.osx
index cf5ec38d29..966829e222 100644
--- a/src/makefile.osx
+++ b/src/makefile.osx
@@ -96,11 +96,6 @@ else
endif
endif
-ifdef USE_QRCODE
- DEFS += -DUSE_QRCODE=$(USE_QRCODE)
- LIBS += -lqrencode
-endif
-
all: bitcoind
# auto-generated dependencies: