aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorphelixbtc <github@blockchained.com>2013-10-21 19:09:12 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2013-11-26 14:00:48 +0100
commite88eb41b6c94d72331ebbce5729d91d5788d14da (patch)
treed854ac8c796eac14339a32e35eeb90106828383d
parent0119e0c592018d5c9e83e301408858ab04b7d674 (diff)
Porting MinGW multithreading bugfix to makefile.mingw
Original fix: https://github.com/bitcoin/bitcoin/commit /8864019f6d88b13d3442843d9e6ebeb8dd938831
-rw-r--r--src/makefile.mingw4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/makefile.mingw b/src/makefile.mingw
index 8b5a5dccd9..5904d3dd02 100644
--- a/src/makefile.mingw
+++ b/src/makefile.mingw
@@ -43,7 +43,7 @@ LIBS= \
-l ssl \
-l crypto
-DEFS=-DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE
+DEFS=-D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE
DEBUGFLAGS=-g
CFLAGS=-mthreads -O2 -w -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
# enable: ASLR, DEP and large address aware
@@ -63,7 +63,7 @@ ifneq (${USE_IPV6}, -)
DEFS += -DUSE_IPV6=$(USE_IPV6)
endif
-LIBS += -l kernel32 -l user32 -l gdi32 -l comdlg32 -l winspool -l winmm -l shell32 -l comctl32 -l ole32 -l oleaut32 -l uuid -l rpcrt4 -l advapi32 -l ws2_32 -l mswsock -l shlwapi
+LIBS += -l mingwthrd -l kernel32 -l user32 -l gdi32 -l comdlg32 -l winspool -l winmm -l shell32 -l comctl32 -l ole32 -l oleaut32 -l uuid -l rpcrt4 -l advapi32 -l ws2_32 -l mswsock -l shlwapi
# TODO: make the mingw builds smarter about dependencies, like the linux/osx builds are
HEADERS = $(wildcard *.h)