Merge remote branch 'refs/remotes/svn/trunk' into svn

14 years ago · 2bda554be4
1 changed files with 3 additions and 1 deletions
--- 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__