Skip to content

Commit 69d605f

Browse files
committed
integration of core bitcoin
1 parent 2097c09 commit 69d605f

31 files changed

+14691
-127
lines changed

TODO

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,3 +62,29 @@ AboutDialog
6262

6363
- Make icon blend into taskbar and maybe silver/grey
6464
Same for the other icons?
65+
66+
67+
Done:
68+
69+
Compatibility with Qt, and some more modularity
70+
71+
- Put guard statements around header files.
72+
73+
- Proper include between header files; remove central "header.h" file.
74+
75+
- Removed macro foreach: conflicts with Qt keyword foreach, replaced back with BOOST_FOREACH
76+
77+
- Prefix stdlib structures and functions with std:: in headers; "using namespace" in header files is
78+
generally frowned upon
79+
80+
Todo:
81+
82+
- Repeated in all files?
83+
#define __STDC_LIMIT_MACROS // to enable UINT64_MAX from stdint.h
84+
#include "main.h"
85+
#ifndef GUI
86+
#include "noui.h"
87+
#endif
88+
89+
- Check windows support / cross platform
90+

bitcoin.pro

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
TEMPLATE = app
22
TARGET =
33
DEPENDPATH += .
4-
INCLUDEPATH += gui/include core/include cryptopp/include
5-
unix:LIBS += -lssl
4+
INCLUDEPATH += gui/include core/include cryptopp/include json/include
5+
unix:LIBS += -lssl -lboost_system -lboost_filesystem -lboost_program_options -lboost_thread -ldb_cxx
66

77
# Input
88
HEADERS += gui/include/bitcoingui.h \
@@ -34,7 +34,23 @@ HEADERS += gui/include/bitcoingui.h \
3434
core/include/strlcpy.h \
3535
core/include/main.h \
3636
core/include/net.h \
37-
core/include/key.h
37+
core/include/key.h \
38+
core/include/db.h \
39+
core/include/script.h \
40+
core/include/noui.h \
41+
core/include/init.h \
42+
core/include/headers.h \
43+
core/include/irc.h \
44+
json/include/json/json_spirit_writer_template.h \
45+
json/include/json/json_spirit_writer.h \
46+
json/include/json/json_spirit_value.h \
47+
json/include/json/json_spirit_utils.h \
48+
json/include/json/json_spirit_stream_reader.h \
49+
json/include/json/json_spirit_reader_template.h \
50+
json/include/json/json_spirit_reader.h \
51+
json/include/json/json_spirit_error_position.h \
52+
json/include/json/json_spirit.h \
53+
core/include/rpc.h
3854
SOURCES += gui/src/bitcoin.cpp gui/src/bitcoingui.cpp \
3955
gui/src/transactiontablemodel.cpp \
4056
gui/src/addresstablemodel.cpp \
@@ -47,7 +63,17 @@ SOURCES += gui/src/bitcoin.cpp gui/src/bitcoingui.cpp \
4763
gui/src/bitcoinaddressvalidator.cpp \
4864
cryptopp/src/sha.cpp \
4965
cryptopp/src/cpu.cpp \
50-
core/src/util.cpp
66+
core/src/util.cpp \
67+
core/src/script.cpp \
68+
core/src/main.cpp \
69+
core/src/init.cpp \
70+
core/src/rpc.cpp \
71+
core/src/net.cpp \
72+
core/src/irc.cpp \
73+
core/src/db.cpp \
74+
json/src/json_spirit_writer.cpp \
75+
json/src/json_spirit_value.cpp \
76+
json/src/json_spirit_reader.cpp
5177

5278
RESOURCES += \
5379
gui/bitcoin.qrc

0 commit comments

Comments
 (0)