ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-20 19:15:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Roll back SConstruct to fix proto changes

Browse Source
This commit is contained in:
Vinnie Falco
2013-05-25 17:42:46 -07:00
parent 094cde3418
commit 9169eae969
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
SConstruct
View File

@@ -47,10 +47,10 @@ else:
# #
# Put objects files in their own directory. # Put objects files in their own directory.
# #
for dir in ['.', 'ripple', 'database', 'leveldb/db', 'leveldb/port', 'leveldb/include', 'leveldb/table', 'leveldb/util', 'websocketpp']: for dir in ['.', 'ripple', 'database', 'json', 'leveldb/db', 'leveldb/port', 'leveldb/include', 'leveldb/table', 'leveldb/util', 'websocketpp']:
VariantDir('build/obj/'+dir, 'src/cpp/'+dir, duplicate=0) VariantDir('build/obj/'+dir, 'src/cpp/'+dir, duplicate=0)
for dir in [ 'ripple_json', 'ripple_mess', 'ripple_basics', 'ripple_client', 'ripple_db', 'ripple_ledger', 'ripple_main', 'ripple_net' ]: for dir in [ 'ripple_basics', 'ripple_client', 'ripple_db', 'ripple_ledger', 'ripple_main', 'ripple_net' ]:
VariantDir('build/obj/'+dir, 'modules/'+dir, duplicate=0) VariantDir('build/obj/'+dir, 'modules/'+dir, duplicate=0)
# Use openssl # Use openssl
@@ -125,9 +125,10 @@ if OSX:
if LevelDB: if LevelDB:
env.Append(CXXFLAGS = [ '-Isrc/cpp/leveldb', '-Isrc/cpp/leveldb/port', '-Isrc/cpp/leveldb/include', '-DUSE_LEVELDB']) env.Append(CXXFLAGS = [ '-Isrc/cpp/leveldb', '-Isrc/cpp/leveldb/port', '-Isrc/cpp/leveldb/include', '-DUSE_LEVELDB'])
LEVELDB_SRCS = [ 'src/cpp/leveldb_core.cpp' ] LEVELDB_SRCS = [ 'src/cpp/leveldb_core.cpp' ]
DB_SRCS = glob.glob('src/cpp/database/*.c') + glob.glob('src/cpp/database/*.cpp') DB_SRCS = glob.glob('src/cpp/database/*.c') + glob.glob('src/cpp/database/*.cpp')
JSON_SRCS = glob.glob('src/cpp/json/*.cpp')
WEBSOCKETPP_SRCS = [ WEBSOCKETPP_SRCS = [
'src/cpp/websocketpp/src/base64/base64.cpp', 'src/cpp/websocketpp/src/base64/base64.cpp',
@@ -157,7 +158,7 @@ for file in UNUSED_SRCS:
TAG_SRCS = copy.copy(RIPPLE_SRCS) TAG_SRCS = copy.copy(RIPPLE_SRCS)
# Add other sources. # Add other sources.
RIPPLE_SRCS += DB_SRCS + WEBSOCKETPP_SRCS RIPPLE_SRCS += DB_SRCS + JSON_SRCS + WEBSOCKETPP_SRCS
if LevelDB: if LevelDB:
RIPPLE_SRCS += LEVELDB_SRCS RIPPLE_SRCS += LEVELDB_SRCS
@@ -173,11 +174,11 @@ RIPPLE_OBJS += PROTO_SRCS
RIPPLE_OBJS = [] RIPPLE_OBJS = []
RIPPLE_OBJS += [ 'src/cpp/database/sqlite3.c' ] RIPPLE_OBJS += [ 'src/cpp/database/sqlite3.c', 'build/proto/ripple.pb.cc' ]
env.Append(CXXFLAGS = ['-I.', '-Isrc/cpp/ripple']) env.Append(CXXFLAGS = ['-I.', '-Isrc/cpp/ripple'])
RIPPLE_CORES = [ 'src/cpp/leveldb_core.cpp', 'src/cpp/websocket_core.cpp' ] RIPPLE_CORES = [ 'src/cpp/json_core.cpp', 'src/cpp/leveldb_core.cpp', 'src/cpp/websocket_core.cpp' ]
RIPPLE_MODULES = glob.glob('modules/*/*.cpp') RIPPLE_MODULES = glob.glob('modules/*/*.cpp')
for file in RIPPLE_MODULES: for file in RIPPLE_MODULES: