diff options
| author | Jeff Garzik <jgarzik@bitpay.com> | 2013-06-23 08:48:19 -0700 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@bitpay.com> | 2013-06-23 08:48:19 -0700 |
| commit | 5aa40ac2076db7d710253409729dcc3aa7112cfa (patch) | |
| tree | c14785909a2830465e2d82929751fdcdc75bfda4 | |
| parent | d1e38050e2cc0c79c899490892f68c14e914acb1 (diff) | |
| parent | 336a53ddbcfd9e8c5e2199a90f9abec54090c29f (diff) | |
| download | bitcoin-5aa40ac2076db7d710253409729dcc3aa7112cfa.tar.xz | |
Merge pull request #2787 from Diapolo/makefiles
fix makefiles and init.cpp after chainparams merge
| -rw-r--r-- | src/makefile.linux-mingw | 3 | ||||
| -rw-r--r-- | src/makefile.mingw | 3 | ||||
| -rw-r--r-- | src/makefile.osx | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw index 9cfab5942a..26d541664e 100644 --- a/src/makefile.linux-mingw +++ b/src/makefile.linux-mingw @@ -93,7 +93,8 @@ OBJS= \ obj/hash.o \ obj/bloom.o \ obj/leveldb.o \ - obj/txdb.o + obj/txdb.o \ + obj/chainparams.o all: bitcoind.exe diff --git a/src/makefile.mingw b/src/makefile.mingw index 33cc7e6b4a..3659f52040 100644 --- a/src/makefile.mingw +++ b/src/makefile.mingw @@ -101,7 +101,8 @@ OBJS= \ obj/bloom.o \ obj/noui.o \ obj/leveldb.o \ - obj/txdb.o + obj/txdb.o \ + obj/chainparams.o all: bitcoind.exe diff --git a/src/makefile.osx b/src/makefile.osx index bef0ef3518..269460c1ba 100644 --- a/src/makefile.osx +++ b/src/makefile.osx @@ -104,7 +104,8 @@ OBJS= \ obj/bloom.o \ obj/noui.o \ obj/leveldb.o \ - obj/txdb.o + obj/txdb.o \ + obj/chainparams.o ifndef USE_UPNP override USE_UPNP = - |