Merge branch 'code-cleanup' of git://github.com/muggenhor/bitcoin

This commit is contained in:
Gavin Andresen
2011-09-01 11:52:07 -04:00
13 changed files with 632 additions and 482 deletions

View File

@@ -35,9 +35,29 @@ LIBS= \
DEFS=-D_MT -DWIN32 -D__WXMSW__ -D_WINDOWS -DNOPCH -DUSE_SSL -DBOOST_THREAD_USE_LIB
DEBUGFLAGS=-g -D__WXDEBUG__
CFLAGS=-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 keystore.h main.h wallet.h rpc.h uibase.h ui.h noui.h \
crypter.h init.h
HEADERS = \
base58.h \
bignum.h \
crypter.h \
db.h \
headers.h \
init.h \
irc.h \
key.h \
keystore.h \
main.h \
net.h \
noui.h \
protocol.h \
rpc.h \
script.h \
serialize.h \
strlcpy.h \
ui.h \
uibase.h \
uint256.h \
util.h \
wallet.h
ifdef USE_UPNP
LIBPATHS += -L"$(DEPSDIR)/miniupnpc"
@@ -48,17 +68,18 @@ endif
LIBS += -l mingwthrd -l kernel32 -l user32 -l gdi32 -l comdlg32 -l winspool -l winmm -l shell32 -l comctl32 -l ole32 -l oleaut32 -l uuid -l rpcrt4 -l advapi32 -l ws2_32 -l shlwapi
OBJS= \
obj/util.o \
obj/script.o \
obj/crypter.o \
obj/db.o \
obj/net.o \
obj/init.o \
obj/irc.o \
obj/keystore.o \
obj/main.o \
obj/wallet.o \
obj/net.o \
obj/protocol.o \
obj/rpc.o \
obj/init.o \
obj/crypter.o \
obj/script.o \
obj/util.o \
obj/wallet.o \
cryptopp/obj/sha.o \
cryptopp/obj/cpu.o