diff options
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/SConstruct b/SConstruct index 81c12c7c318..2531872af6c 100644 --- a/SConstruct +++ b/SConstruct @@ -166,6 +166,13 @@ if sys.platform=='win32': env.SConscriptChdir(0) +# Remove major kernel version from linux platform. +# After Linus switched kernel to new version model this major version +# shouldn't take much sense for building rules. + +if re.match('linux[0-9]+', platform): + platform = 'linux' + crossbuild = B.arguments.get('BF_CROSS', None) if crossbuild and platform not in ('win32-vc', 'win64-vc'): platform = 'linuxcross' @@ -262,15 +269,15 @@ if env['OURPLATFORM']=='darwin': else: print B.bc.OKGREEN + "Found recommended sdk :" + B.bc.ENDC + " using MacOSX10.5.sdk" - # for now, Mac builders must download and install the driver framework from 3Dconnexion + # for now, Mac builders must download and install the 3DxWare 10 Beta 4 driver framework from 3Dconnexion # necessary header file lives here when installed: # /Library/Frameworks/3DconnexionClient.framework/Versions/Current/Headers/ConnexionClientAPI.h - if env['WITH_BF_3DMOUSE'] == 1 and not os.path.exists('/Library/Frameworks/3DconnexionClient.framework'): - print "3D_CONNEXION_CLIENT_LIBRARY not found, disabling WITH_BF_3DMOUSE" # avoid build errors ! - env['WITH_BF_3DMOUSE'] = 0 - else: - env.Append(LINKFLAGS=['-weak_framework','3DconnexionClient']) - + if env['WITH_BF_3DMOUSE'] == 1: + if not os.path.exists('/Library/Frameworks/3DconnexionClient.framework'): + print "3D_CONNEXION_CLIENT_LIBRARY not found, disabling WITH_BF_3DMOUSE" # avoid build errors ! + env['WITH_BF_3DMOUSE'] = 0 + else: + env.Append(LINKFLAGS=['-weak_framework','3DconnexionClient']) if env['WITH_BF_OPENMP'] == 1: if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): @@ -551,7 +558,7 @@ if env['OURPLATFORM']!='darwin': scriptinstall.append(env.Install(dir=dir,source=source)) #-- icons -if env['OURPLATFORM']=='linux2': +if env['OURPLATFORM']=='linux': iconlist = [] icontargetlist = [] @@ -630,7 +637,7 @@ textinstall = env.Install(dir=env['BF_INSTALLDIR'], source=textlist) if env['OURPLATFORM']=='darwin': allinstall = [blenderinstall, plugininstall, textinstall] -elif env['OURPLATFORM']=='linux2': +elif env['OURPLATFORM']=='linux': allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, textinstall, iconinstall] else: allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, textinstall] |