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

This commit is contained in:
Gavin Andresen 2010-10-14 16:46:16 -04:00
commit 2bda554be4

View File

@ -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__