diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-08-02 21:59:43 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-08-02 21:59:43 +0400 |
| commit | 13eefec9ddcc5f5dc7a7328ed5f24c1dd4a000fd (patch) | |
| tree | 61252fcb461f759972a07c3af3ff75d10e343fb3 /build_files | |
| parent | 6a37c2411512569a93017b1b200971935c919491 (diff) | |
More flexible configuration for 3dmouse library for scons.
Needed for release environment and buildbot.
Buildbot rules would be updated with next commit after
environment will be tested.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/scons/config/linux2-config.py | 6 | ||||
| -rw-r--r-- | build_files/scons/tools/Blender.py | 11 | ||||
| -rw-r--r-- | build_files/scons/tools/btools.py | 6 |
3 files changed, 21 insertions, 2 deletions
diff --git a/build_files/scons/config/linux2-config.py b/build_files/scons/config/linux2-config.py index 6fb9090b022..d8e227cfb21 100644 --- a/build_files/scons/config/linux2-config.py +++ b/build_files/scons/config/linux2-config.py @@ -194,7 +194,11 @@ BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-pthread'] #SpaceNavigator and friends WITH_BF_3DMOUSE = True +BF_3DMOUSE = '/usr' +BF_3DMOUSE_INC = '${BF_3DMOUSE}/include' +BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib' BF_3DMOUSE_LIB = 'spnav' +BF_3DMOUSE_LIB_STATIC = '${BF_3DMOUSE_LIBPATH}/libspnav.a' ## CC = 'gcc' @@ -227,8 +231,6 @@ CXX_WARN = ['-Wno-invalid-offsetof', '-Wno-sign-compare'] ##FIX_STUBS_WARNINGS = -Wno-unused LLIBS = ['util', 'c', 'm', 'dl', 'pthread', 'stdc++'] -if WITH_BF_3DMOUSE: - LLIBS = LLIBS + [BF_3DMOUSE_LIB]; ##LOPTS = --dynamic ##DYNLDFLAGS = -shared $(LDFLAGS) diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py index 75af7e47edd..6fae2785192 100644 --- a/build_files/scons/tools/Blender.py +++ b/build_files/scons/tools/Blender.py @@ -206,6 +206,12 @@ def setup_staticlibs(lenv): if lenv['WITH_BF_STATICJEMALLOC']: statlibs += Split(lenv['BF_JEMALLOC_LIB_STATIC']) + if lenv['OURPLATFORM']=='linux2': + if lenv['WITH_BF_3DMOUSE']: + libincs += Split(lenv['BF_3DMOUSE_LIBPATH']) + if lenv['WITH_BF_STATIC3DMOUSE']: + statlibs += Split(lenv['BF_3DMOUSE_LIB_STATIC']) + return statlibs, libincs def setup_syslibs(lenv): @@ -271,6 +277,11 @@ def setup_syslibs(lenv): if not lenv['WITH_BF_STATICJEMALLOC']: syslibs += Split(lenv['BF_JEMALLOC_LIB']) + if lenv['OURPLATFORM']=='linux2': + if lenv['WITH_BF_3DMOUSE']: + if not lenv['WITH_BF_STATIC3DMOUSE']: + syslibs += Split(lenv['BF_3DMOUSE_LIB']) + syslibs += lenv['LLIBS'] return syslibs diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py index a96bf8ce4cc..b20f3ede68d 100644 --- a/build_files/scons/tools/btools.py +++ b/build_files/scons/tools/btools.py @@ -438,6 +438,12 @@ def read_opts(env, cfg, args): (BoolVariable('WITH_BF_NOBLENDER', 'Do not build blender if true', False)), (BoolVariable('WITH_BF_3DMOUSE', 'Build blender with support of 3D mouses', False)), + (BoolVariable('WITH_BF_STATIC3DMOUSE', 'Staticly link to 3d mouse library', False)), + ('BF_3DMOUSE', '3d mouse library base path', ''), + ('BF_3DMOUSE_INC', '3d mouse library include path', ''), + ('BF_3DMOUSE_LIB', '3d mouse library', ''), + ('BF_3DMOUSE_LIBPATH', '3d mouse library path', ''), + ('BF_3DMOUSE_LIB_STATIC', '3d mouse static library', ''), ('CFLAGS', 'C only flags', []), ('CCFLAGS', 'Generic C and C++ flags', []), |