aboutsummaryrefslogtreecommitdiff
path: root/makefile.unix
diff options
context:
space:
mode:
authors_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b>2010-09-07 01:12:53 +0000
committers_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b>2010-09-07 01:12:53 +0000
commitf1e1fb4bdef878c8fc1564fa418d44e7541a7e83 (patch)
tree1f3dcb611059e60f2faa5d75d72186aacfff18df /makefile.unix
parentd743f0355269e2e03fe3f982e250d07999d72b98 (diff)
downloadbitcoin-f1e1fb4bdef878c8fc1564fa418d44e7541a7e83.tar.xz
cleanup,
catch some recoverable exceptions and continue git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@148 1a98c847-1fd6-4fd8-948a-caf3550aa51b
Diffstat (limited to 'makefile.unix')
-rw-r--r--makefile.unix4
1 files changed, 3 insertions, 1 deletions
diff --git a/makefile.unix b/makefile.unix
index 7a38bf0464..21994154a4 100644
--- a/makefile.unix
+++ b/makefile.unix
@@ -7,11 +7,13 @@ INCLUDEPATHS= \
-I"/usr/local/include/wx-2.9" \
-I"/usr/local/lib/wx/include/gtk2-unicode-debug-static-2.9"
+# for wxWidgets 2.9.1, add -l Xxf86vm
WXLIBS= \
-Wl,-Bstatic \
-l wx_gtk2ud-2.9 \
-Wl,-Bdynamic \
- -l gtk-x11-2.0 -l SM
+ -l gtk-x11-2.0 \
+ -l SM
# for boost 1.37, add -mt to the boost libraries
LIBS= \