diff --git a/makefile.unix b/makefile.unix index 6694dde04..6c7a37c6e 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 3e67bc2bf..98985c034 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}"