Browse Source

Define BOOST_SPIRIT_THREADSAFE in all makefiles

rather than at each include site.

Fixes #1371
tags/v0.15.1
Jeff Garzik 9 years ago
parent
commit
7b671f52e0
6 changed files with 5 additions and 6 deletions
  1. 1
    1
      bitcoin-qt.pro
  2. 0
    1
      src/bitcoinrpc.h
  3. 1
    1
      src/makefile.linux-mingw
  4. 1
    1
      src/makefile.mingw
  5. 1
    1
      src/makefile.osx
  6. 1
    1
      src/makefile.unix

+ 1
- 1
bitcoin-qt.pro View File

@@ -2,7 +2,7 @@ TEMPLATE = app
TARGET =
VERSION = 0.6.99
INCLUDEPATH += src src/json src/qt
DEFINES += QT_GUI BOOST_THREAD_USE_LIB USE_IPV6
DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE USE_IPV6
CONFIG += no_include_pwd

# for boost 1.37, add -mt to the boost libraries

+ 0
- 1
src/bitcoinrpc.h View File

@@ -9,7 +9,6 @@
#include <string>
#include <map>

#define BOOST_SPIRIT_THREADSAFE
#include "json/json_spirit_reader_template.h"
#include "json/json_spirit_writer_template.h"
#include "json/json_spirit_utils.h"

+ 1
- 1
src/makefile.linux-mingw View File

@@ -27,7 +27,7 @@ LIBS= \
-l ssl \
-l crypto

DEFS=-D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DUSE_IPV6
DEFS=-D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE -DUSE_IPV6
DEBUGFLAGS=-g
CFLAGS=-O2 -w -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)


+ 1
- 1
src/makefile.mingw View File

@@ -23,7 +23,7 @@ LIBS= \
-l ssl \
-l crypto

DEFS=-DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DUSE_IPV6
DEFS=-DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE -DUSE_IPV6
DEBUGFLAGS=-g
CFLAGS=-mthreads -O2 -w -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)


+ 1
- 1
src/makefile.osx View File

@@ -53,7 +53,7 @@ LIBS += \
TESTDEFS += -DBOOST_TEST_DYN_LINK
endif

DEFS=-DMAC_OSX -DMSG_NOSIGNAL=0 -DUSE_IPV6
DEFS=-DMAC_OSX -DMSG_NOSIGNAL=0 -DBOOST_SPIRIT_THREADSAFE -DUSE_IPV6

ifdef RELEASE
# Compile for maximum compatibility and smallest size.

+ 1
- 1
src/makefile.unix View File

@@ -4,7 +4,7 @@

USE_UPNP:=0

DEFS=-DUSE_IPV6
DEFS=-DUSE_IPV6 -DBOOST_SPIRIT_THREADSAFE

DEFS += $(addprefix -I,$(CURDIR) $(CURDIR)/obj $(BOOST_INCLUDE_PATH) $(BDB_INCLUDE_PATH) $(OPENSSL_INCLUDE_PATH))
LIBS = $(addprefix -L,$(BOOST_LIB_PATH) $(BDB_LIB_PATH) $(OPENSSL_LIB_PATH))

Loading…
Cancel
Save