diff options
| author | --author=Satoshi Nakamoto <satoshin@gmx.com> | 2010-07-31 14:14:41 +0000 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2010-07-31 14:14:41 +0000 |
| commit | e1cb7ce0177de72b00e06dc4c8fe1d414723a9e7 (patch) | |
| tree | 056547588973184e6469edcc45471deb4735cdac | |
| parent | a75560d828464c3f1138f52cf247e956fc8f937d (diff) | |
| download | bitcoin-e1cb7ce0177de72b00e06dc4c8fe1d414723a9e7.tar.xz | |
simplified makefile.unix, updated build-unix.txt instructions to include boost 1.37
| -rw-r--r-- | build-unix.txt | 26 | ||||
| -rw-r--r-- | makefile.unix | 15 |
2 files changed, 12 insertions, 29 deletions
diff --git a/build-unix.txt b/build-unix.txt index 448e6eaf81..1ae29a42ea 100644 --- a/build-unix.txt +++ b/build-unix.txt @@ -16,13 +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. +If using Boost 1.37, append -mt to the boost libraries in the makefile. -There isn't currently a debian package of wxWidgets we can use. The 2.8 -packages for Karmic are UTF-16 unicode and won't work for us, and we've had -trouble building 2.8 on 64-bit. +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 @@ -34,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 @@ -55,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 @@ -63,15 +62,6 @@ make sudo su make install ldconfig -su <username> -cd .. -mkdir buildbase -cd buildbase -../configure --disable-gui --enable-debug --disable-shared --enable-monolithic -make -sudo su -make install -ldconfig Boost diff --git a/makefile.unix b/makefile.unix index e0489ed735..546a3ec2ec 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: |