[Bf-blender-cvs] [e438c45] master: Manifest used to be installed on non-windows platforms

Sergey Sharybin noreply at git.blender.org
Mon Aug 11 13:27:15 CEST 2014


Commit: e438c450b417acaa381664b5619058cc7c2fc580
Author: Sergey Sharybin
Date:   Mon Aug 11 17:26:20 2014 +0600
Branches: master
https://developer.blender.org/rBe438c450b417acaa381664b5619058cc7c2fc580

Manifest used to be installed on non-windows platforms

===================================================================

M	SConstruct

===================================================================

diff --git a/SConstruct b/SConstruct
index 81e27b9..c4454ac 100644
--- a/SConstruct
+++ b/SConstruct
@@ -892,8 +892,9 @@ if env['OURPLATFORM']!='darwin':
         td, tf = os.path.split(targetdir)
         dotblenderinstall.append(env.Install(dir=td, source=srcfile))
 
-    scriptinstall.append(env.InstallAs(env['BF_INSTALLDIR'] + '/blender-app.exe.manifest',
-                                       'source/icons/blender.exe.manifest'))
+    if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'):
+        scriptinstall.append(env.InstallAs(env['BF_INSTALLDIR'] + '/blender-app.exe.manifest',
+                                           'source/icons/blender.exe.manifest'))
 
     if env['WITH_BF_PYTHON']:
         #-- local/VERSION/scripts




More information about the Bf-blender-cvs mailing list