3e5b3153e9
Merge upstream into zmq branch
...
Needs testing to make sure everything works (insofar as it already did
on this branch), but it builds.
Conflicts:
external/CMakeLists.txt
src/daemon/CMakeLists.txt
src/daemon/daemon.cpp
src/wallet/wallet2.h
2015-07-05 09:02:34 -04:00
20f2ae24d6
Resolve conflicts. get_output_indexes broken
2015-04-07 02:07:51 +05:30
94cb295db4
Merge upstream into blockchain
2015-03-29 09:58:18 -04:00
c9424c1316
fix cmake miniupnpc typo
...
which matters on case-sensitive filesystems
2015-03-26 15:28:31 +04:00
6e9e8ab620
Move db_drivers/ to external/
...
Also change LMDB Cmake variables to CACHE rather than upgrading them
through several parent scopes.
2015-03-17 18:55:24 -04:00
11e815761f
Revert "Moved db_drivers/ into external/ for consistency"
...
This reverts commit b21335642e
2015-03-17 18:03:11 -04:00
daf2a8f6cb
Revert "Build fixed, goofed up some CMake"
...
This reverts commit 8b82f3c57f
2015-03-17 18:01:25 -04:00
8b82f3c57f
Build fixed, goofed up some CMake
...
Forgot that CMake vars set to PARENT_SCOPE will still vanish if that
parent scope goes...out of scope. LMDB vars elevated one more scope to
compensate for moving db_drivers/ into external/
2015-03-10 12:51:23 -04:00
b21335642e
Moved db_drivers/ into external/ for consistency
2015-03-09 15:48:46 -04:00
18cbb876d0
Merge with upstream
2015-01-15 22:10:44 +05:30
f4b69d553a
year updated in license
2015-01-02 18:52:46 +02:00
fedf1eb473
net_skeleton server made usable with daemon
2014-11-02 20:45:26 +05:30
edfaa2e484
Wrote a JSON RPC HTTP Server class using net_skeleton. Has issues due to non-OOP nature of net_skeleton
2014-11-01 21:35:26 +05:30
d43a20f8f4
unbound: plumb the libdir up
...
This is necessary for static builds where the linking is passed around
to dependent targets, but the library is lost.
2014-10-24 15:29:56 -04:00
031e3da724
cmake: remove scream-make (all-caps functions)
2014-10-23 16:42:35 -04:00
abbd5c0bdb
unbound: import cmake build system
2014-10-23 16:42:35 -04:00
475fe209a8
cmake: minor cleanups (indentation and typos)
2014-10-23 16:42:35 -04:00
a87ce09461
cmake: factor out error messages
...
Instead of using BoldRed and ColourReset everywhere, wrap it up in a
function.
2014-10-23 16:42:34 -04:00
7c1d3b5090
fixed miniupnpc dynamic target
2014-10-06 23:54:48 +02:00
2cf94c1321
fix for mingw not playing nicely with libunbound configure, fix for correctly finding static libs on various operating systems
2014-10-06 22:29:07 +02:00
e55982a892
set the winsock variable differently on Windows
2014-10-06 19:40:53 +02:00
0586a27a13
fixed configure_command for libunbound under mingw
2014-10-06 19:19:47 +02:00
f8fd03602c
turns out mingw does actually produce .a libs and not .dll.a
2014-10-06 19:17:40 +02:00
1afba7311e
quieten CMake when it can't find packages
2014-10-06 18:56:59 +02:00
735a017bb3
removed required flags from miniupnp and unbound
2014-10-06 18:51:03 +02:00
5829b35147
include openssl in linbunbound static linking, added errors for openssl and expat
2014-10-06 18:08:33 +02:00
c70fa8689f
reference the correct unbound static lib
2014-10-06 18:08:33 +02:00
954a244afe
added libtool's install command
2014-10-06 18:08:33 +02:00
fd52015a2d
use the correct CMake variable for static builds
2014-10-06 18:08:33 +02:00
cc0f6a6080
build libunbound correctly
2014-10-06 18:08:32 +02:00
8c00098c75
fix missing parentheses
2014-10-06 18:08:32 +02:00
cee87473ad
build libunbound from external if no local libunbound or for static builds
2014-10-06 18:08:32 +02:00
dda5a03146
fixed FreeBSD miniupnpc niggly
2014-09-24 21:23:23 +02:00
524eae58cc
never use the baked-in miniupnpc on FreeBSD because explosions
2014-09-24 20:57:09 +02:00
d34f681ed6
fixed miniupnpc static building
2014-09-21 02:23:28 +02:00
b35c1e2491
fixed UPNP_LIBRARIES scope
2014-09-11 13:28:49 +02:00
d21cf293e1
added license to CMake
2014-09-11 08:25:07 +02:00
36c7ea9f77
more CMake tweaks to allow detection on OS X
2014-09-11 08:22:49 +02:00
8d8b47e69f
more dynamic miniupnp fixes
2014-09-10 20:01:30 +02:00
7d01dad8f4
use external miniupnpc if available
2014-09-10 18:14:57 +02:00
5a65991480
exclude local miniupnpc for FreeBSD, install from ports instead
2014-09-09 14:03:42 +02:00
9682a15400
Port mapping with UPnP
2014-04-09 13:14:35 +01:00
Thomas Winget