aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGavin Andresen <[email protected]>2010-10-14 16:46:16 -0400
committerGavin Andresen <[email protected]>2010-10-14 16:46:16 -0400
commit2bda554be4a7fc38075f93d301d971df31b2a27d (patch)
treeda6671c8f87001bf3182b135591cef1eb4e28a48
parentMerge remote branch 'refs/remotes/svn/trunk' into svn (diff)
parentmakefile.unix tweak from Xunie so bitcoind links on Ubuntu 10.04 x86_64 (diff)
downloaddiscoin-2bda554be4a7fc38075f93d301d971df31b2a27d.tar.xz
discoin-2bda554be4a7fc38075f93d301d971df31b2a27d.zip
Merge remote branch 'refs/remotes/svn/trunk' into svn
-rw-r--r--makefile.unix4
1 files changed, 3 insertions, 1 deletions
diff --git a/makefile.unix b/makefile.unix
index aa85ef9a0..9573a560f 100644
--- a/makefile.unix
+++ b/makefile.unix
@@ -26,7 +26,9 @@ LIBS= \
-l ssl \
-l crypto \
-Wl,-Bdynamic \
- -l gthread-2.0
+ -l gthread-2.0 \
+ -l z \
+ -l dl
DEFS=-D__WXGTK__ -DNOPCH -DFOURWAYSSE2 -DUSE_SSL
DEBUGFLAGS=-g -D__WXDEBUG__