diff options
| author | Philip Kaufmann <phil.kaufmann@t-online.de> | 2013-06-23 17:39:39 +0200 |
|---|---|---|
| committer | Philip Kaufmann <phil.kaufmann@t-online.de> | 2013-06-23 17:39:39 +0200 |
| commit | 336a53ddbcfd9e8c5e2199a90f9abec54090c29f (patch) | |
| tree | c14785909a2830465e2d82929751fdcdc75bfda4 /src | |
| parent | 4be2aba302a30812df6962c5ea3b81669ed630e9 (diff) | |
| download | bitcoin-336a53ddbcfd9e8c5e2199a90f9abec54090c29f.tar.xz | |
fix makefiles and init.cpp after chainparams merge
- add missing chainparams.o to some makefiles
- remove a double-include of chainparams.h in init.cpp
Diffstat (limited to 'src')
| -rw-r--r-- | src/init.cpp | 1 | ||||
| -rw-r--r-- | src/makefile.linux-mingw | 3 | ||||
| -rw-r--r-- | src/makefile.mingw | 3 | ||||
| -rw-r--r-- | src/makefile.osx | 3 |
4 files changed, 6 insertions, 4 deletions
diff --git a/src/init.cpp b/src/init.cpp index 5090c4ea40..7b98253ead 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -14,7 +14,6 @@ #include "util.h" #include "ui_interface.h" #include "checkpoints.h" -#include "chainparams.h" #include <boost/filesystem.hpp> #include <boost/filesystem/fstream.hpp> 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 = - |