Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2011-08-02 21:59:43 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2011-08-02 21:59:43 +0400
commit13eefec9ddcc5f5dc7a7328ed5f24c1dd4a000fd (patch)
tree61252fcb461f759972a07c3af3ff75d10e343fb3 /build_files/scons/config
parent6a37c2411512569a93017b1b200971935c919491 (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/scons/config')
-rw-r--r--build_files/scons/config/linux2-config.py6
1 files changed, 4 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)