Boost libraries: ['boost_signals', 'boost_regex',
'boost_filesystem', 'boost_iostreams']
Extra libraries: ['Aiksaurus', 'aspell', 'qt-mt', 'GL', 'Xmu',
'Xi', 'Xrender', 'Xrandr', 'Xcursor', 'Xft', 'freetype', 'fontconfig', 'Xext',
'X11', 'SM', 'ICE', 'resolv', 'pthread']
System libraries: ['shlwapi', 'z']
Frontend:
Try attached patch. (The same as lars?)
Bo
Index: development/scons/SConscript
===================================================================
--- development/scons/SConscript (revision 13829)
+++ development/scons/SConscript (working copy)
@@ -16,7 +16,7 @@
# boost libraries
#
if env['INCLUDED_BOOST']:
- env.BuildDir('#$BUILDDIR/common', '$TOP_SRC_DIR/boost/libs', duplicate = 0)
+ env.BuildDir('#$BUILDDIR/boost', '$TOP_SRC_DIR/boost/libs', duplicate = 0)
boostenv = env.Copy()
boostenv.Append(CCFLAGS = '-DBOOST_USER_CONFIG="<config.h>"')
@@ -27,7 +27,7 @@
filesystem = boostenv.StaticLibrary(
target = '$LOCALLIBPATH/boost_filesystem',
- source = ["#$BUILDDIR/common/filesystem/src/%s" % x for x in Split('''
+ source = ["#$BUILDDIR/boost/filesystem/src/%s" % x for x in Split('''
convenience.cpp
exception.cpp
operations_posix_windows.cpp
@@ -39,7 +39,7 @@
regex = boostenv.StaticLibrary(
target = '$LOCALLIBPATH/boost_regex',
- source = ["#$BUILDDIR/common/regex/src/%s" % x for x in Split('''
+ source = ["#$BUILDDIR/boost/regex/src/%s" % x for x in Split('''
cpp_regex_traits.cpp
c_regex_traits.cpp
cregex.cpp
@@ -55,13 +55,11 @@
# Return the library
Return('regex')
- Import('boostenv')
-
print 'Processing files in boost/libs/signals/src...'
signals = boostenv.StaticLibrary(
target = '$LOCALLIBPATH/boost_signals',
- source = ["#$BUILDDIR/common/signals/src/%s" % x for x in Split('''
+ source = ["#$BUILDDIR/boost/signals/src/%s" % x for x in Split('''
connection.cpp
named_slot_map.cpp
signal_base.cpp
@@ -74,7 +72,7 @@
iostreams = boostenv.StaticLibrary(
target = '$LOCALLIBPATH/boost_iostreams',
- source = ["#$BUILDDIR/common/iostreams/src/%s" % x for x in Split('''
+ source = ["#$BUILDDIR/boost/iostreams/src/%s" % x for x in Split('''
file_descriptor.cpp
mapped_file.cpp
zlib.cpp
Index: development/scons/SConstruct
===================================================================
--- development/scons/SConstruct (revision 13829)
+++ development/scons/SConstruct (working copy)
@@ -275,7 +275,7 @@
)
# set environment since I do not really like ENV = os.environ
-#env['ENV']['PATH'] = os.environ.get('PATH')
+env['ENV']['PATH'] = os.environ.get('PATH')
env['ENV']['HOME'] = os.environ.get('HOME')
env['TOP_SRC_DIR'] = TOP_SRC_DIR
