diff options
| author | --author=Satoshi Nakamoto <satoshin@gmx.com> | 2010-07-27 20:43:55 +0000 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2010-07-27 20:43:55 +0000 |
| commit | 3dd20ff2f87958a440c9dceae8abe3967aa48fcf (patch) | |
| tree | 5cf88b4e9ba89460a83488561d9fd23feaa87365 /makefile.mingw | |
| parent | 9f35575ca34eb15b20d1d5374b56ac9d4c8cc2bf (diff) | |
| download | bitcoin-3dd20ff2f87958a440c9dceae8abe3967aa48fcf.tar.xz | |
added a subset of Crypto++ 5.6.0 with 48% faster ASM SHA-256, combined speedup 2.5x faster vs 0.3.3, thanks BlackEye for figuring out the alignment problem
Diffstat (limited to 'makefile.mingw')
| -rw-r--r-- | makefile.mingw | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/makefile.mingw b/makefile.mingw index 0eeeb6a55b..9140c23ec5 100644 --- a/makefile.mingw +++ b/makefile.mingw @@ -32,7 +32,19 @@ DEFS=-DWIN32 -D__WXMSW__ -D_WINDOWS -DNOPCH DEBUGFLAGS=-g -D__WXDEBUG__ CFLAGS=-mthreads -O2 -w -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS) $(INCLUDEPATHS) HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h \ - script.h db.h net.h irc.h main.h rpc.h uibase.h ui.h noui.h init.h sha.h + script.h db.h net.h irc.h main.h rpc.h uibase.h ui.h noui.h init.h + +OBJS= \ + obj/util.o \ + obj/script.o \ + obj/db.o \ + obj/net.o \ + obj/irc.o \ + obj/main.o \ + obj/rpc.o \ + obj/init.o \ + cryptopp/obj/sha.o \ + cryptopp/obj/cpu.o all: bitcoin.exe @@ -41,34 +53,25 @@ all: bitcoin.exe obj/%.o: %.cpp $(HEADERS) g++ -c $(CFLAGS) -DGUI -o $@ $< -obj/sha.o: sha.cpp sha.h - g++ -c $(CFLAGS) -O3 -o $@ $< +cryptopp/obj/%.o: cryptopp/%.cpp + g++ -c $(CFLAGS) -O3 -DCRYPTOPP_X86_ASM_AVAILABLE -o $@ $< obj/ui_res.o: ui.rc rc/bitcoin.ico rc/check.ico rc/send16.bmp rc/send16mask.bmp rc/send16masknoshadow.bmp rc/send20.bmp rc/send20mask.bmp rc/addressbook16.bmp rc/addressbook16mask.bmp rc/addressbook20.bmp rc/addressbook20mask.bmp windres $(DEFS) $(INCLUDEPATHS) -o $@ -i $< -OBJS= \ - obj/util.o \ - obj/script.o \ - obj/db.o \ - obj/net.o \ - obj/irc.o \ - obj/main.o \ - obj/rpc.o \ - obj/init.o - -bitcoin.exe: $(OBJS) obj/ui.o obj/uibase.o obj/sha.o obj/ui_res.o +bitcoin.exe: $(OBJS) obj/ui.o obj/uibase.o obj/ui_res.o g++ $(CFLAGS) -mwindows -Wl,--subsystem,windows -o $@ $(LIBPATHS) $^ $(WXLIBS) $(LIBS) obj/nogui/%.o: %.cpp $(HEADERS) g++ -c $(CFLAGS) -o $@ $< -bitcoind.exe: $(OBJS:obj/%=obj/nogui/%) obj/sha.o obj/ui_res.o +bitcoind.exe: $(OBJS:obj/%=obj/nogui/%) obj/ui_res.o g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) clean: -del /Q obj\* -del /Q obj\nogui\* + -del /Q cryptopp\obj\* -del /Q headers.h.gch |