diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-03-13 12:29:47 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-03-13 12:29:47 +0300 |
commit | cf8cc39d4cf5a5e85070f4e3c99c383159d60940 (patch) | |
tree | 8ddbe560f3b3f5155ba656cb6624c80127f06953 /build_files | |
parent | 0c734577f40415b36e85598bee56f7079b8a3fef (diff) |
Make BF_PYTHON_ABI_FLAGS a scons option. Default flags are empty.
Made changed to linux2-config and freebsd*-config. Windows/MacOS are kept
unchanged.
I'm not sure which flags should be used for freebsd systems, so flags for
them also kept empty. Maintainers of this platform, please check which
flags should be used and make changes to rules.
Diffstat (limited to 'build_files')
-rw-r--r-- | build_files/scons/config/freebsd7-config.py | 7 | ||||
-rw-r--r-- | build_files/scons/config/freebsd8-config.py | 7 | ||||
-rw-r--r-- | build_files/scons/config/freebsd9-config.py | 7 | ||||
-rw-r--r-- | build_files/scons/config/linux2-config.py | 8 | ||||
-rw-r--r-- | build_files/scons/tools/btools.py | 1 |
5 files changed, 17 insertions, 13 deletions
diff --git a/build_files/scons/config/freebsd7-config.py b/build_files/scons/config/freebsd7-config.py index fed23db33ee..a73574abf67 100644 --- a/build_files/scons/config/freebsd7-config.py +++ b/build_files/scons/config/freebsd7-config.py @@ -4,14 +4,15 @@ CXX = 'g++44' LCGDIR = '../lib/freebsd7' LIBDIR = "${LCGDIR}" +BF_PYTHON_ABI_FLAGS = '' BF_PYTHON = '/usr/local' BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib' BF_PYTHON_VERSION = '3.2' WITH_BF_STATICPYTHON = False -BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}' +BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}' BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}' -BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}' -BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION}.a' +BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}' +BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}.a' WITH_BF_OPENAL = True WITH_BF_STATICOPENAL = False diff --git a/build_files/scons/config/freebsd8-config.py b/build_files/scons/config/freebsd8-config.py index b15d3ea54d9..dd7ab5f9ab9 100644 --- a/build_files/scons/config/freebsd8-config.py +++ b/build_files/scons/config/freebsd8-config.py @@ -4,14 +4,15 @@ CXX = 'g++44' LCGDIR = '../lib/freebsd8' LIBDIR = "${LCGDIR}" +BF_PYTHON_ABI_FLAGS = '' BF_PYTHON = '/usr/local' BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib' BF_PYTHON_VERSION = '3.2' WITH_BF_STATICPYTHON = False -BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}' +BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}' BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}' -BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}' -BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION}.a' +BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}' +BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}.a' WITH_BF_OPENAL = True WITH_BF_STATICOPENAL = False diff --git a/build_files/scons/config/freebsd9-config.py b/build_files/scons/config/freebsd9-config.py index 2e96dd3120e..9c53d52ce71 100644 --- a/build_files/scons/config/freebsd9-config.py +++ b/build_files/scons/config/freebsd9-config.py @@ -4,14 +4,15 @@ CXX = 'g++44' LCGDIR = '../lib/freebsd9' LIBDIR = "${LCGDIR}" +BF_PYTHON_ABI_FLAGS = '' BF_PYTHON = '/usr/local' BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib' BF_PYTHON_VERSION = '3.2' WITH_BF_STATICPYTHON = False -BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}' +BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}' BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}' -BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}' -BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION}.a' +BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}' +BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}.a' WITH_BF_OPENAL = True WITH_BF_STATICOPENAL = False diff --git a/build_files/scons/config/linux2-config.py b/build_files/scons/config/linux2-config.py index 9f4671a8ddd..d4e97c78c38 100644 --- a/build_files/scons/config/linux2-config.py +++ b/build_files/scons/config/linux2-config.py @@ -1,16 +1,16 @@ LCGDIR = '../lib/linux2' LIBDIR = "${LCGDIR}" -BF_PYTHON_ABI_FLAGS = "m" # not a scons option +BF_PYTHON_ABI_FLAGS = 'm' # Most common for linux distros BF_PYTHON = '/usr' BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib' BF_PYTHON_VERSION = '3.2' WITH_BF_STATICPYTHON = False -BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}' + BF_PYTHON_ABI_FLAGS +BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}' BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}' -BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}' + BF_PYTHON_ABI_FLAGS # BF_PYTHON+'/lib/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a' +BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}' # BF_PYTHON+'/lib/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a' BF_PYTHON_LINKFLAGS = ['-Xlinker', '-export-dynamic'] -BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION}' + BF_PYTHON_ABI_FLAGS + '.a' +BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}.a' WITH_BF_OPENAL = True WITH_BF_STATICOPENAL = False diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py index d589079a0d4..c03dfb3011a 100644 --- a/build_files/scons/tools/btools.py +++ b/build_files/scons/tools/btools.py @@ -222,6 +222,7 @@ def read_opts(env, cfg, args): ('BF_PYTHON_LIBPATH', 'Library path', ''), ('BF_PYTHON_LINKFLAGS', 'Python link flags', ''), (BoolVariable('WITH_BF_STATICPYTHON', 'Staticly link to python', False)), + ('BF_PYTHON_ABI_FLAGS', 'Python ABI flags (suffix in library version: m, mu, etc)', ''), (BoolVariable('BF_NO_ELBEEM', 'Disable Fluid Sim', False)), ('BF_PROFILE_FLAGS', 'Profiling compiler flags', ''), |