From 08fee75201e82f2e34fcc1549ee8edd152f5d040 Mon Sep 17 00:00:00 2001
From: s_nakamoto <s_nakamoto@1a98c847-1fd6-4fd8-948a-caf3550aa51b>
Date: Sun, 15 Aug 2010 22:46:58 +0000
Subject: [PATCH] makefile.unix to build with option to enable tcatm's 4-way
 SSE2 SHA-256 with -4way switch on Linux -- version 0.3.10 release

git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@134 1a98c847-1fd6-4fd8-948a-caf3550aa51b
---
 makefile.unix | 9 ++++++---
 setup.nsi     | 6 +++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/makefile.unix b/makefile.unix
index 7418d6dcf4..1a7b8fcc65 100644
--- a/makefile.unix
+++ b/makefile.unix
@@ -25,7 +25,7 @@ LIBS= \
  -Wl,-Bdynamic \
    -l gthread-2.0
 
-DEFS=-D__WXGTK__ -DNOPCH
+DEFS=-D__WXGTK__ -DNOPCH -DFOURWAYSSE2
 DEBUGFLAGS=-g -D__WXDEBUG__
 CFLAGS=-O2 -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS)
 HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h \
@@ -53,14 +53,17 @@ obj/%.o: %.cpp $(HEADERS)
 cryptopp/obj/%.o: cryptopp/%.cpp
 	g++ -c $(CFLAGS) -O3 -o $@ $<
 
-bitcoin: $(OBJS) obj/ui.o obj/uibase.o
+obj/sha256.o: sha256.cpp
+	g++ -c $(CFLAGS) -msse2 -O3 -o $@ $<
+
+bitcoin: $(OBJS) obj/ui.o obj/uibase.o obj/sha256.o
 	g++ $(CFLAGS) -o $@ $^ $(WXLIBS) $(LIBS)
 
 
 obj/nogui/%.o: %.cpp $(HEADERS)
 	g++ -c $(CFLAGS) -o $@ $<
 
-bitcoind: $(OBJS:obj/%=obj/nogui/%)
+bitcoind: $(OBJS:obj/%=obj/nogui/%) obj/sha256.o
 	g++ $(CFLAGS) -o $@ $^ $(LIBS)
 
 
diff --git a/setup.nsi b/setup.nsi
index da03820bba..3dc1a1507e 100644
--- a/setup.nsi
+++ b/setup.nsi
@@ -7,7 +7,7 @@ RequestExecutionLevel highest
 
 # General Symbol Definitions
 !define REGKEY "SOFTWARE\$(^Name)"
-!define VERSION 0.3.9
+!define VERSION 0.3.10
 !define COMPANY "Bitcoin project"
 !define URL http://www.bitcoin.org/
 
@@ -42,12 +42,12 @@ Var StartMenuGroup
 !insertmacro MUI_LANGUAGE English
 
 # Installer attributes
-OutFile bitcoin-0.3.9-win32-setup.exe
+OutFile bitcoin-0.3.10-win32-setup.exe
 InstallDir $PROGRAMFILES\Bitcoin
 CRCCheck on
 XPStyle on
 ShowInstDetails show
-VIProductVersion 0.3.9.0
+VIProductVersion 0.3.10.0
 VIAddVersionKey ProductName Bitcoin
 VIAddVersionKey ProductVersion "${VERSION}"
 VIAddVersionKey CompanyName "${COMPANY}"