From 92422ba4525dedfc1687dfff14e11ee805a30c23 Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Thu, 26 Aug 2010 06:58:32 +0000 Subject: Patch [#23389] Add authorship information to exported COLLADA files Contributed by Imran Syed (freakabcd). This adds basic authoring tool and author info ("Blender User" for now). NOTE: Linux and OSX users need now to update their OpenCOLLADA libs - Blender should now compile fine with their latest revision. Made some changes to the original patch to ensure linking is done correctly. Some small cleanups for scons too. --- SConstruct | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'SConstruct') diff --git a/SConstruct b/SConstruct index 4715a955d7f..811298cc851 100644 --- a/SConstruct +++ b/SConstruct @@ -406,12 +406,12 @@ thestatlibs, thelibincs = B.setup_staticlibs(env) thesyslibs = B.setup_syslibs(env) if 'blender' in B.targets or not env['WITH_BF_NOBLENDER']: - env.BlenderProg(B.root_build_dir, "blender", dobj + mainlist + thestatlibs, [], thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender') + env.BlenderProg(B.root_build_dir, "blender", 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, 'intern') playerlist += B.create_blender_liblist(env, 'extern') - env.BlenderProg(B.root_build_dir, "blenderplayer", dobj + playerlist, [], thestatlibs + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blenderplayer') + env.BlenderProg(B.root_build_dir, "blenderplayer", playerlist, thestatlibs + dobj + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blenderplayer') ##### Now define some targets -- cgit v1.2.3