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:
Diffstat (limited to 'build_files')
-rw-r--r--build_files/scons/config/darwin-config.py4
-rw-r--r--build_files/scons/config/linux2-config.py8
2 files changed, 6 insertions, 6 deletions
diff --git a/build_files/scons/config/darwin-config.py b/build_files/scons/config/darwin-config.py
index ca99357330f..4a4bc4acd67 100644
--- a/build_files/scons/config/darwin-config.py
+++ b/build_files/scons/config/darwin-config.py
@@ -266,7 +266,7 @@ elif MACOSX_ARCHITECTURE == 'x86_64':
BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-msse2']
# SpaceNavigator and related 3D mice
-WITH_BF_SPACENAV = True
+WITH_BF_3DMOUSE = True
#############################################################################
################### various compile settings and flags ##################
@@ -296,7 +296,7 @@ if WITH_BF_QUICKTIME == True:
else:
PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','QuickTime']
-if WITH_BF_SPACENAV:
+if WITH_BF_3DMOUSE:
PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS + ['-weak_framework','3DconnexionClient']
#note to build succesfully on 10.3.9 SDK you need to patch 10.3.9 by adding the SystemStubs.a lib from 10.4
diff --git a/build_files/scons/config/linux2-config.py b/build_files/scons/config/linux2-config.py
index 2f7bdace7d3..6fb9090b022 100644
--- a/build_files/scons/config/linux2-config.py
+++ b/build_files/scons/config/linux2-config.py
@@ -193,8 +193,8 @@ WITH_BF_RAYOPTIMIZATION = True
BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-pthread']
#SpaceNavigator and friends
-WITH_BF_NDOF = True
-BF_NDOF_LIB = 'spnav'
+WITH_BF_3DMOUSE = True
+BF_3DMOUSE_LIB = 'spnav'
##
CC = 'gcc'
@@ -227,8 +227,8 @@ CXX_WARN = ['-Wno-invalid-offsetof', '-Wno-sign-compare']
##FIX_STUBS_WARNINGS = -Wno-unused
LLIBS = ['util', 'c', 'm', 'dl', 'pthread', 'stdc++']
-if WITH_BF_NDOF:
- LLIBS = LLIBS + [BF_NDOF_LIB];
+if WITH_BF_3DMOUSE:
+ LLIBS = LLIBS + [BF_3DMOUSE_LIB];
##LOPTS = --dynamic
##DYNLDFLAGS = -shared $(LDFLAGS)