diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-02-17 09:16:19 -0500 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-02-17 09:16:19 -0500 |
| commit | fb811c31fd28d1d637a50f784af620d085fa32d4 (patch) | |
| tree | d665c0e80f5461ca3b819d2cefdf342b90476d77 /src/makefile.unix | |
| parent | 9ab932b76988d41ea83d4c5cfb9353e06922ccaa (diff) | |
| parent | 0365f19dececa3bd84ae28ec4aabb955ffb8b405 (diff) | |
| download | bitcoin-fb811c31fd28d1d637a50f784af620d085fa32d4.tar.xz | |
Merge branch '0.5.0.x' into 0.5.x
Conflicts:
src/qt/bitcoingui.cpp
Diffstat (limited to 'src/makefile.unix')
| -rw-r--r-- | src/makefile.unix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/makefile.unix b/src/makefile.unix index 53948bcba6..e75dda514f 100644 --- a/src/makefile.unix +++ b/src/makefile.unix @@ -7,7 +7,7 @@ USE_UPNP:=0 DEFS=-DNOPCH DEFS += $(addprefix -I,$(BOOST_INCLUDE_PATH) $(BDB_INCLUDE_PATH) $(OPENSSL_INCLUDE_PATH)) -LIBS += $(addprefix -l,$(BOOST_LIB_PATH) $(BDB_LIB_PATH) $(OPENSSL_LIB_PATH)) +LIBS = $(addprefix -L,$(BOOST_LIB_PATH) $(BDB_LIB_PATH) $(OPENSSL_LIB_PATH)) LMODE = dynamic LMODE2 = dynamic @@ -21,7 +21,7 @@ else endif # for boost 1.37, add -mt to the boost libraries -LIBS= \ +LIBS += \ -Wl,-B$(LMODE) \ -l boost_system$(BOOST_LIB_SUFFIX) \ -l boost_filesystem$(BOOST_LIB_SUFFIX) \ |