diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-11-09 23:02:42 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-11-09 23:02:42 +0400 |
| commit | f09f5eec57f0072495aadc91153e3b564dc3cb0f (patch) | |
| tree | 62701216136de12f64db0db650119052bbd7d91f /build_files/buildbot/config | |
| parent | 2a747e8b0312b5499c74aa2faf436a7d1d52159d (diff) | |
- Added options to link staticly against oiio/boost
- Also changed buildbot settings so now linking should happe staticly
Diffstat (limited to 'build_files/buildbot/config')
| -rw-r--r-- | build_files/buildbot/config/user-config-i686.py | 14 | ||||
| -rw-r--r-- | build_files/buildbot/config/user-config-x86_64.py | 14 |
2 files changed, 16 insertions, 12 deletions
diff --git a/build_files/buildbot/config/user-config-i686.py b/build_files/buildbot/config/user-config-i686.py index 0a35babeaf5..c368bf1bd79 100644 --- a/build_files/buildbot/config/user-config-i686.py +++ b/build_files/buildbot/config/user-config-i686.py @@ -96,16 +96,18 @@ WITH_BF_JACK = True WITH_BF_CYCLES = True WITH_BF_OIIO = True +WITH_BF_STATICOIIO = True BF_OIIO = '/opt/oiio' -BF_OIIO_INC = '/opt/oiio/include' -BF_OIIO_LIB = 'OpenImageIO IlmImf' -BF_OIIO_LIBPATH = '/opt/oiio/lib' +BF_OIIO_INC = '${BF_OIIO}/include' +BF_OIIO_LIB_STATIC = '${BF_OIIO_LIBPATH}/libOpenImageIO.a' +BF_OIIO_LIBPATH = '${BF_OIIO}/lib' WITH_BF_BOOST = True +WITH_BF_STATICBOOST = True BF_BOOST = '/opt/boost' -BF_BOOST_INC = '/opt/boost/include' -BF_BOOST_LIB = 'libboost_date_time libboost_filesystem libboost_regex libboost_system libboost_thread' -BF_BOOST_LIBPATH = '/opt/boost/lib' +BF_BOOST_INC = '${BF_BOOST}/include' +BF_BOOST_LIB_STATIC = '${BF_BOOST_LIBPATH}/libboost_filesystem.a ${BF_BOOST_LIBPATH}/libboost_date_time.a ${BF_BOOST_LIBPATH}/libboost_regex.a ${BF_BOOST_LIBPATH}/libboost_system.a ${BF_BOOST_LIBPATH}/libboost_thread.a' +BF_BOOST_LIBPATH = '${BF_BOOST}/lib' # Compilation and optimization BF_DEBUG = False diff --git a/build_files/buildbot/config/user-config-x86_64.py b/build_files/buildbot/config/user-config-x86_64.py index c3c1f0b9d90..d72b3bfb1c4 100644 --- a/build_files/buildbot/config/user-config-x86_64.py +++ b/build_files/buildbot/config/user-config-x86_64.py @@ -96,16 +96,18 @@ WITH_BF_JACK = True WITH_BF_CYCLES = True WITH_BF_OIIO = True +WITH_BF_STATICOIIO = True BF_OIIO = '/opt/oiio' -BF_OIIO_INC = '/opt/oiio/include' -BF_OIIO_LIB = 'OpenImageIO IlmImf' -BF_OIIO_LIBPATH = '/opt/oiio/lib' +BF_OIIO_INC = '${BF_OIIO}/include' +BF_OIIO_LIB_STATIC = '${BF_OIIO_LIBPATH}/libOpenImageIO.a' +BF_OIIO_LIBPATH = '${BF_OIIO}/lib' WITH_BF_BOOST = True +WITH_BF_STATICBOOST = True BF_BOOST = '/opt/boost' -BF_BOOST_INC = '/opt/boost/include' -BF_BOOST_LIB = 'libboost_date_time libboost_filesystem libboost_regex libboost_system libboost_thread' -BF_BOOST_LIBPATH = '/opt/boost/lib' +BF_BOOST_INC = '${BF_BOOST}/include' +BF_BOOST_LIB_STATIC = '${BF_BOOST_LIBPATH}/libboost_filesystem.a ${BF_BOOST_LIBPATH}/libboost_date_time.a ${BF_BOOST_LIBPATH}/libboost_regex.a ${BF_BOOST_LIBPATH}/libboost_system.a ${BF_BOOST_LIBPATH}/libboost_thread.a' +BF_BOOST_LIBPATH = '${BF_BOOST}/lib' # Compilation and optimization BF_DEBUG = False |