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

Use pkg-config for protobuf, it works also on FreeBSD.

Browse Source 
Do not add sources/headers to OBJECT_FILES.
This commit is contained in:
Alex Dupre
2013-06-26 12:01:22 +02:00
parent 1dffaf5d57
commit 3556ae5325
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
SConstruct
View File

@@ -49,6 +49,8 @@ else:
# Use openssl # Use openssl
env.ParseConfig('pkg-config --cflags --libs openssl') env.ParseConfig('pkg-config --cflags --libs openssl')
# Use protobuf
env.ParseConfig('pkg-config --cflags --libs protobuf')
# The required version of boost is documented in the README file. # The required version of boost is documented in the README file.
# #
@@ -143,15 +145,9 @@ if not FreeBSD:
] ]
) )
# Apparently, pkg-config --libs protobuf on bsd fails to provide this necessary include dir.
if FreeBSD:
env.Append(LINKFLAGS = ['-I/usr/local/include'])
env.Append(CXXFLAGS = ['-DOS_FREEBSD'])
env.Append( env.Append(
LIBS = [ LIBS = [
'rt', # for clock_nanosleep in beast 'rt', # for clock_nanosleep in beast
'protobuf',
'z' 'z'
] ]
) )
@@ -183,7 +179,7 @@ TAG_SRCS = copy.copy(COMPILED_FILES)
# Derive the object files from the source files. # Derive the object files from the source files.
OBJECT_FILES = [] OBJECT_FILES = []
OBJECT_FILES += PROTO_SRCS OBJECT_FILES.append(PROTO_SRCS[0])
for file in COMPILED_FILES: for file in COMPILED_FILES:
OBJECT_FILES.append('build/obj/' + file) OBJECT_FILES.append('build/obj/' + file)