diff options
author | Gavin Andresen <gavinandresen@gmail.com> | 2010-10-14 16:46:16 -0400 |
---|---|---|
committer | Gavin Andresen <gavinandresen@gmail.com> | 2010-10-14 16:46:16 -0400 |
commit | 2bda554be4a7fc38075f93d301d971df31b2a27d (patch) | |
tree | da6671c8f87001bf3182b135591cef1eb4e28a48 | |
parent | cc8005b4e735115b63a9de74ac6a644cfb30565f (diff) | |
parent | 2fad3d34b7b9bf03d56970cb36d9a091609b10c8 (diff) | |
download | bitcoin-2bda554be4a7fc38075f93d301d971df31b2a27d.tar.xz |
Merge remote branch 'refs/remotes/svn/trunk' into svn
-rw-r--r-- | makefile.unix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/makefile.unix b/makefile.unix index aa85ef9a08..9573a560f6 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__ |