From 3e46abf9b8783150dc0c28f7523a47e61fa6c5bf Mon Sep 17 00:00:00 2001 From: jed Date: Mon, 18 Jun 2012 07:29:26 -0700 Subject: [PATCH] . --- SConstruct | 83 ----------------------------------------- newcoin.vcxproj | 1 + newcoin.vcxproj.filters | 1 + 3 files changed, 2 insertions(+), 83 deletions(-) diff --git a/SConstruct b/SConstruct index 10ec3f1b77..820d9e2328 100644 --- a/SConstruct +++ b/SConstruct @@ -89,86 +89,3 @@ tags = env.CTags('obj/tags', NEWCOIN_SRCS) Default(newcoind, tags) -##################### - -# -# Newcoin - SConstruct -# - -import glob - -CTAGS = '/usr/bin/exuberant-ctags' - -# -# scons tools -# - -env = Environment( - tools = ['default', 'protoc'] - ) - -# -# Builder for CTags -# -#ctags = Builder(action = '$CTAGS $CTAGSOPTIONS -f $TARGET $SOURCES') -#env.Append(BUILDERS = { 'CTags' : ctags }) -#env.Replace(CTAGS = CTAGS, CTAGSOPTIONS = '--tag-relative') - -# -# Put objects files in their own directory. -# -for dir in ['src', 'database', 'json', 'util']: - VariantDir('obj/'+dir, dir, duplicate=0) - -# Use openssl -env.ParseConfig('pkg-config --cflags --libs openssl') - -env.Append(LIBS = [ - 'boost_date_time', - 'boost_filesystem', - 'boost_program_options', - 'boost_regex', - 'boost_system', - 'boost_thread', - 'protobuf', - 'dl', # dynamic linking - 'z' - ]) - -DEBUGFLAGS = ['-g', '-DDEBUG'] -BOOSTFLAGS = ['-DBOOST_TEST_DYN_LINK', '-DBOOST_FILESYSTEM_NO_DEPRECATED'] - -#env.Append(LINKFLAGS = ['-static', '-pthread','-L/home/ubuntu/boost_1_49_0/stage/lib']) -env.Append(LINKFLAGS = ['-rdynamic', '-pthread','-L/home/ubuntu/boost_1_49_0/stage/lib']) -env.Append(CCFLAGS = ['-I/home/ubuntu/boost_1_49_0','-pthread', '-Wall', '-Wno-sign-compare', '-Wno-char-subscripts', '-DSQLITE_THREADSAFE']) -env.Append(CXXFLAGS = ['-O0', '-pthread', '-Wno-invalid-offsetof', '-Wformat']+BOOSTFLAGS+DEBU GFLAGS) - -DB_SRCS = glob.glob('database/*.c') + glob.glob('database/*.cpp') -JSON_SRCS = glob.glob('json/*.cpp') -NEWCOIN_SRCS = glob.glob('src/*.cpp') -PROTO_SRCS = env.Protoc([], 'src/newcoin.proto', PROTOCOUTDIR='obj', PROTOCPYTHONOUTDIR=N one) - -env.Clean(PROTO_SRCS, 'site_scons/site_tools/protoc.pyc') - -# Remove unused source files. -UNUSED_SRCS = ['src/HttpReply.cpp', 'src/ValidationCollection.cpp'] - -for file in UNUSED_SRCS: - NEWCOIN_SRCS.remove(file) - -NEWCOIN_SRCS += DB_SRCS + JSON_SRCS - -# Derive the object files from the source files. -NEWCOIN_OBJS = [] - -for file in NEWCOIN_SRCS: - NEWCOIN_OBJS.append('obj/' + file) - -NEWCOIN_OBJS += PROTO_SRCS - -newcoind = env.Program('newcoind', NEWCOIN_OBJS) - -#tags = env.CTags('obj/tags', NEWCOIN_SRCS) - -Default(newcoind) - diff --git a/newcoin.vcxproj b/newcoin.vcxproj index d012dcb838..830dc5098c 100644 --- a/newcoin.vcxproj +++ b/newcoin.vcxproj @@ -251,6 +251,7 @@ + diff --git a/newcoin.vcxproj.filters b/newcoin.vcxproj.filters index e1589e2b82..41af172d3c 100644 --- a/newcoin.vcxproj.filters +++ b/newcoin.vcxproj.filters @@ -485,6 +485,7 @@ +