From 0e9c67734388b91b55fbf968b778d0c68586b6c8 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Thu, 7 Aug 2014 20:01:20 +0600 Subject: Add blender launcher application when building with MSVC Main idea of this change is to make a small executable which will set OMP_WAIT_POLICY environment variable and then will launch blender itself. This is a teporary solution for the time being we'll have a more clear solution to high CPU usage with OpenMP when building with MSVC. Reviewers: campbellbarton, juicyfruit Reviewed By: juicyfruit Differential Revision: https://developer.blender.org/D717 --- SConstruct | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'SConstruct') diff --git a/SConstruct b/SConstruct index eec6b8206ab..81e27b95858 100644 --- a/SConstruct +++ b/SConstruct @@ -832,7 +832,17 @@ for x in B.create_blender_liblist(env, 'system'): thelibincs.append(os.path.dirname(x)) if 'blender' in B.targets or not env['WITH_BF_NOBLENDER']: - env.BlenderProg(B.root_build_dir, "blender", creob + mainlist + thestatlibs + dobj, thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender') + blender_progname = "blender" + if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'): + blender_progname = "blender-app" + + lenv = env.Clone() + lenv.Append(LINKFLAGS = env['PLATFORM_LINKFLAGS']) + targetpath = B.root_build_dir + '/blender' + launcher_obj = [env.Object(B.root_build_dir + 'source/creator/creator/creator_launch_win', ['#source/creator/creator_launch_win.c'])] + env.BlenderProg(B.root_build_dir, 'blender', [launcher_obj] + B.resources, [], [], 'blender') + + env.BlenderProg(B.root_build_dir, blender_progname, creob + mainlist + thestatlibs + dobj, thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender') if env['WITH_BF_PLAYER']: playerlist = B.create_blender_liblist(env, 'player') playerlist += B.create_blender_liblist(env, 'player2') @@ -882,6 +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['WITH_BF_PYTHON']: #-- local/VERSION/scripts scriptpaths=['release/scripts'] -- cgit v1.2.3