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.osx | |
parent | 9f35575ca34eb15b20d1d5374b56ac9d4c8cc2bf (diff) |
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.osx')
-rw-r--r-- | makefile.osx | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/makefile.osx b/makefile.osx index b31de9bb64..39ca449819 100644 --- a/makefile.osx +++ b/makefile.osx @@ -29,17 +29,7 @@ DEBUGFLAGS=-g -DwxDEBUG_LEVEL=0 # ppc doesn't work because we don't support big-endian CFLAGS=-mmacosx-version-min=10.5 -arch i386 -arch x86_64 -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 \ - script.h db.h net.h irc.h main.h rpc.h uibase.h ui.h noui.h init.h sha.h - - -all: bitcoin - - -obj/%.o: %.cpp $(HEADERS) - g++ -c $(CFLAGS) -DGUI -o $@ $< - -obj/sha.o: sha.cpp sha.h - g++ -c $(CFLAGS) -O3 -o $@ $< + script.h db.h net.h irc.h main.h rpc.h uibase.h ui.h noui.h init.h OBJS= \ obj/util.o \ @@ -49,16 +39,28 @@ OBJS= \ obj/irc.o \ obj/main.o \ obj/rpc.o \ - obj/init.o + obj/init.o \ + cryptopp/obj/sha.o \ + cryptopp/obj/cpu.o -bitcoin: $(OBJS) obj/ui.o obj/uibase.o obj/sha.o + +all: bitcoin + + +obj/%.o: %.cpp $(HEADERS) + g++ -c $(CFLAGS) -DGUI -o $@ $< + +cryptopp/obj/%.o: cryptopp/%.cpp + g++ -c $(CFLAGS) -O3 -o $@ $< + +bitcoin: $(OBJS) obj/ui.o obj/uibase.o g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ $(WXLIBS) $(LIBS) obj/nogui/%.o: %.cpp $(HEADERS) g++ -c $(CFLAGS) -o $@ $< -bitcoind: $(OBJS:obj/%=obj/nogui/%) obj/sha.o +bitcoind: $(OBJS:obj/%=obj/nogui/%) g++ $(CFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS) |