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:
authorCampbell Barton <ideasman42@gmail.com>2011-08-07 20:54:40 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-08-07 20:54:40 +0400
commit577293569a0e7ba8fdb0411401c86fc1bd5dcbde (patch)
tree569b0e1bcdd1b8b850a2d83efc230ec0eb33c4e8 /build_files/scons/tools
parent479c203dad2868da012bff884dade573d6254993 (diff)
scons patch from jensverwiebe
fix a silly bug in version detection, - added an OSX sdk-check jensverwiebe, needs to get commit access!, but will apply his patches for now.
Diffstat (limited to 'build_files/scons/tools')
-rw-r--r--build_files/scons/tools/btools.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py
index 9b911b9d6f0..25e0582c536 100644
--- a/build_files/scons/tools/btools.py
+++ b/build_files/scons/tools/btools.py
@@ -149,7 +149,7 @@ def validate_arguments(args, bc):
'BF_PROFILE_CFLAGS', 'BF_PROFILE_CCFLAGS', 'BF_PROFILE_CXXFLAGS', 'BF_PROFILE_LINKFLAGS',
'BF_DEBUG_CFLAGS', 'BF_DEBUG_CCFLAGS', 'BF_DEBUG_CXXFLAGS',
'C_WARN', 'CC_WARN', 'CXX_WARN',
- 'LLIBS', 'PLATFORM_LINKFLAGS','MACOSX_ARCHITECTURE',
+ 'LLIBS', 'PLATFORM_LINKFLAGS','MACOSX_ARCHITECTURE', 'MACOSX_SDK_CHECK', 'XCODE_CUR_VER',
]
@@ -462,6 +462,8 @@ def read_opts(env, cfg, args):
('LLIBS', 'Platform libs', []),
('PLATFORM_LINKFLAGS', 'Platform linkflags', []),
('MACOSX_ARCHITECTURE', 'python_arch.zip select', ''),
+ ('MACOSX_SDK_CHECK', 'detect available OSX sdk`s', ''),
+ ('XCODE_CUR_VER', 'detect XCode version', ''),
(BoolVariable('BF_PROFILE', 'Add profiling information if true', False)),
('BF_PROFILE_CFLAGS', 'C only profiling flags', []),