aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlan Westbrook <[email protected]>2014-01-27 13:39:05 -0800
committerAlan Westbrook <[email protected]>2014-01-27 13:39:05 -0800
commit9748bc3f52a1135f62f08027f875ce36d95f3a8e (patch)
treeb361b9958fdb77c4b697d4e3ecf71f7de99b27f0 /src
parentFix warnings in Mac build (diff)
downloaddiscoin-9748bc3f52a1135f62f08027f875ce36d95f3a8e.tar.xz
discoin-9748bc3f52a1135f62f08027f875ce36d95f3a8e.zip
Fix dogecoind build errors
* wildcard on mac makefile doesn’t work the way it works on other platforms =P * Add missing json_spirit_value objects for all the platform makefiles
Diffstat (limited to 'src')
-rw-r--r--src/makefile.linux-mingw1
-rw-r--r--src/makefile.mingw1
-rw-r--r--src/makefile.osx7
-rw-r--r--src/makefile.unix3
4 files changed, 7 insertions, 5 deletions
diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw
index e6c972332..662873f54 100644
--- a/src/makefile.linux-mingw
+++ b/src/makefile.linux-mingw
@@ -59,6 +59,7 @@ HEADERS = $(wildcard *.h)
OBJS= \
leveldb/libleveldb.a \
+ json/json_spirit_value.o \
obj/alert.o \
obj/version.o \
obj/checkpoints.o \
diff --git a/src/makefile.mingw b/src/makefile.mingw
index fca41e665..4d86c172e 100644
--- a/src/makefile.mingw
+++ b/src/makefile.mingw
@@ -71,6 +71,7 @@ HEADERS = $(wildcard *.h)
OBJS= \
leveldb/libleveldb.a \
+ json/json_spirit_value.o \
obj/alert.o \
obj/version.o \
obj/checkpoints.o \
diff --git a/src/makefile.osx b/src/makefile.osx
index efa0d3996..e22046244 100644
--- a/src/makefile.osx
+++ b/src/makefile.osx
@@ -9,11 +9,9 @@
CXX=c++
-CHECKDIR=$(wildcard /usr/local/Cellar)
+DEPSDIR = $(shell if [ -e /usr/local/Cellar ]; then echo "/usr/local"; fi)
-ifneq ($(CHECK_DIR),)
- DEPSDIR=/usr/local
-else
+ifeq ($(DEPSDIR),)
DEPSDIR=/opt/local
endif
@@ -83,6 +81,7 @@ CFLAGS += -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter \
OBJS= \
leveldb/libleveldb.a \
+ json/json_spirit_value.o \
obj/alert.o \
obj/version.o \
obj/checkpoints.o \
diff --git a/src/makefile.unix b/src/makefile.unix
index a32e7b22c..a0386d5f8 100644
--- a/src/makefile.unix
+++ b/src/makefile.unix
@@ -144,7 +144,8 @@ OBJS= \
obj/bloom.o \
obj/noui.o \
obj/leveldb.o \
- obj/txdb.o
+ obj/txdb.o \
+ json/json_spirit_value.o
ifdef USE_SSE2