Mercurial > hg > bitcoin

changeset 548:279deeca6269 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge pull request #186 from TheBlueMatt/nopng. Remove unnecessary line which creates a dependency on wx's png library.
author Gavin Andresen <gavinandresen@gmail.com>
date Sun, 01 May 2011 06:39:31 -0700
parents fe9a8136b33e (current diff) a69a1619979e (diff)
children 598172ac080f
files
diffstat 2 files changed, 1 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/build-unix.txt
+++ b/build-unix.txt
@@ -73,7 +73,7 @@
 cd wxWidgets-2.9.0
 mkdir buildgtk
 cd buildgtk
-../configure --with-gtk --enable-debug --disable-shared --enable-monolithic
+../configure --with-gtk --enable-debug --disable-shared --enable-monolithic --without-libpng --disable-svg
 make
 sudo su
 make install
--- a/ui.cpp
+++ b/ui.cpp
@@ -2839,9 +2839,6 @@
     extern int g_isPainting;
     g_isPainting = 10000;
 #endif
-#ifdef GUI
-    wxImage::AddHandler(new wxPNGHandler);
-#endif
 #if defined(__WXMSW__ ) || defined(__WXMAC_OSX__)
     SetAppName("Bitcoin");
 #else