diff options
| author | s_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b> | 2010-07-30 23:22:55 +0000 |
|---|---|---|
| committer | s_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b> | 2010-07-30 23:22:55 +0000 |
| commit | 01bed1828b9ee64b9b38a7d0345c775de40fdd91 (patch) | |
| tree | bb9b5d11b732027ff6b33cbddcaecb34c0619a7a | |
| parent | 757f0769d8360ea043f469f3a35f6ec204740446 (diff) | |
| download | bitcoin-01bed1828b9ee64b9b38a7d0345c775de40fdd91.tar.xz | |
simplified makefile.unix, updated build-unix.txt instructions to include boost 1.37
git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@120 1a98c847-1fd6-4fd8-948a-caf3550aa51b
| -rw-r--r-- | build-unix.txt | 16 | ||||
| -rw-r--r-- | makefile.unix | 15 |
2 files changed, 13 insertions, 18 deletions
diff --git a/build-unix.txt b/build-unix.txt index fad502a3ef..f1f001ba70 100644 --- a/build-unix.txt +++ b/build-unix.txt @@ -16,10 +16,12 @@ sudo apt-get install libgtk2.0-dev sudo apt-get install libssl-dev
sudo apt-get install libdb4.7-dev
sudo apt-get install libdb4.7++-dev
-sudo apt-get install libboost-all-dev
+Boost 1.40+: sudo apt-get install libboost-all-dev
+or Boost 1.37: sudo apt-get install libboost1.37-dev
-We're now using wxWidgets 2.9, which uses UTF-8. Don't try to use 2.8, it
-won't work.
+If using Boost 1.37, append -mt to the boost libraries in the makefile.
+
+We're now using wxWidgets 2.9, which uses UTF-8. Don't try 2.8, it won't work.
You need to download wxWidgets from http://www.wxwidgets.org/downloads/
and build it yourself. See the build instructions and configure parameters
@@ -31,11 +33,11 @@ Berkeley DB New BSD license with additional requirement that linked software Boost MIT-like license
Versions used in this release:
-GCC 4.4.3
-OpenSSL 0.9.8k
+GCC 4.3.3
+OpenSSL 0.9.8g
wxWidgets 2.9.0
Berkeley DB 4.7.25.NC
-Boost 1.40.0
+Boost 1.37
Notes
@@ -52,7 +54,7 @@ wxWidgets ---------
cd /usr/local
tar -xzvf wxWidgets-2.9.0.tar.gz
-cd /usr/local/wxWidgets-2.9.0
+cd wxWidgets-2.9.0
mkdir buildgtk
cd buildgtk
../configure --with-gtk --enable-debug --disable-shared --enable-monolithic
diff --git a/makefile.unix b/makefile.unix index 597a0eaba0..e965287917 100644 --- a/makefile.unix +++ b/makefile.unix @@ -4,20 +4,16 @@ INCLUDEPATHS= \
- -I"/usr/include" \
-I"/usr/local/include/wx-2.9" \
-I"/usr/local/lib/wx/include/gtk2-unicode-debug-static-2.9"
-LIBPATHS= \
- -L"/usr/lib" \
- -L"/usr/local/lib"
-
WXLIBS= \
-Wl,-Bstatic \
-l wx_gtk2ud-2.9 \
-Wl,-Bdynamic \
-l gtk-x11-2.0 -l SM
+# for boost 1.37, add -mt to the boost libraries
LIBS= \
-Wl,-Bstatic \
-l boost_system \
@@ -51,24 +47,21 @@ OBJS= \ all: bitcoin
-headers.h.gch: headers.h $(HEADERS)
- g++ -c $(CFLAGS) -DGUI -o $@ $<
-
-obj/%.o: %.cpp $(HEADERS) headers.h.gch
+obj/%.o: %.cpp $(HEADERS)
g++ -c $(CFLAGS) -DGUI -o $@ $<
cryptopp/obj/%.o: cryptopp/%.cpp
g++ -c $(CFLAGS) -O3 -DCRYPTOPP_DISABLE_SSE2 -o $@ $<
bitcoin: $(OBJS) obj/ui.o obj/uibase.o
- g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ $(WXLIBS) $(LIBS)
+ g++ $(CFLAGS) -o $@ $^ $(WXLIBS) $(LIBS)
obj/nogui/%.o: %.cpp $(HEADERS)
g++ -c $(CFLAGS) -o $@ $<
bitcoind: $(OBJS:obj/%=obj/nogui/%)
- g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS)
+ g++ $(CFLAGS) -o $@ $^ $(LIBS)
clean:
|