diff options
| author | Arystanbek Dyussenov <arystan.d@gmail.com> | 2009-07-22 09:35:12 +0400 |
|---|---|---|
| committer | Arystanbek Dyussenov <arystan.d@gmail.com> | 2009-07-22 09:35:12 +0400 |
| commit | 3321a1fd4ad3ca1faeaa2bb59ce0ca8796f46e35 (patch) | |
| tree | f9a6936aa83767358b2ecca488c9578fe2e3bacb /config/linux2-config.py | |
| parent | 3b058378ddd13b704e779c5b9aca8ecfe9621176 (diff) | |
| parent | d44d7e220dfbf7b0575ec93f1bb18777f4277eef (diff) | |
Merge with 2.5 -r 21003:21788.
Run smoothly :)
Diffstat (limited to 'config/linux2-config.py')
| -rw-r--r-- | config/linux2-config.py | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/config/linux2-config.py b/config/linux2-config.py index 5a89e8a80b7..5724617e307 100644 --- a/config/linux2-config.py +++ b/config/linux2-config.py @@ -1,17 +1,9 @@ LCGDIR = '../lib/linux2' LIBDIR = "${LCGDIR}" -def py_version_string(): - ''' - returns py version - "2.5", "2.6" etc - ''' - import platform - ver = platform.python_version_tuple() - return '%d.%d' % (int(ver[0]), int(ver[1])) # py2.5 uses strings, 2.6 ints - BF_PYTHON = '/usr' BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib' -BF_PYTHON_VERSION = py_version_string() +BF_PYTHON_VERSION = '3.1' WITH_BF_STATICPYTHON = False BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}' BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}' @@ -77,20 +69,11 @@ BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib' WITH_BF_GAMEENGINE = True WITH_BF_PLAYER = True -WITH_BF_ODE = False -BF_ODE = LIBDIR + '/ode' -BF_ODE_INC = BF_ODE + '/include' -BF_ODE_LIB = BF_ODE + '/lib/libode.a' - WITH_BF_BULLET = True BF_BULLET = '#extern/bullet2/src' BF_BULLET_INC = '${BF_BULLET}' BF_BULLET_LIB = 'extern_bullet' -BF_SOLID = '#extern/solid' -BF_SOLID_INC = '${BF_SOLID}' -BF_SOLID_LIB = 'extern_solid' - #WITH_BF_NSPR = True #BF_NSPR = $(LIBDIR)/nspr #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr |