Manual merge of jaromil's source tree reorg commit.

Conflicts: src/sha256.cpp
2011-05-09 14:00:14 -04:00
parent c0430f42b8 84c3fb07b0
commit b17be7e14b
98 changed files with 7 additions and 4 deletions
@@ -1,3 +1,3 @@
-*.exe
-bitcoin
-bitcoind
+src/*.exe
+src/bitcoin
+src/bitcoind
@@ -0,0 +1 @@
+README.md
@@ -106,7 +106,7 @@ Get miniupnpc-1.5.20110215.tar.gz and copy *.h to \upnpc-exe-win32-20110215\mini
 Bitcoin
 -------
 DOS prompt:
-cd \bitcoin
+cd \bitcoin\src
 mingw32-make bitcoin.exe bitcoind.exe -f makefile.mingw
 strip bitcoin.exe
 strip bitcoind.exe
@@ -13,6 +13,8 @@ UNIX BUILD NOTES
 To Build
 --------

+cd src/
+
 make -f makefile.unix            # Bitcoin with wxWidgets GUI
  or
 make -f makefile.unix bitcoind   # Headless bitcoin