diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2010-08-26 10:58:32 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2010-08-26 10:58:32 +0400 |
| commit | 92422ba4525dedfc1687dfff14e11ee805a30c23 (patch) | |
| tree | 305c95a3af396ebd0bbef23e68ac9c2408cc76d7 /build_files | |
| parent | e7c4a0d53b950e5be77528efad907def59d18a8f (diff) | |
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.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/scons/tools/Blender.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py index e16c550cc72..496b169eda7 100644 --- a/build_files/scons/tools/Blender.py +++ b/build_files/scons/tools/Blender.py @@ -724,7 +724,7 @@ class BlenderEnvironment(SConsEnvironment): # note: libs is a global add_lib_to_dict(self, libs, libtype, libname, priority) - def BlenderProg(self=None, builddir=None, progname=None, sources=None, includes=None, libs=None, libpath=None, binarykind=''): + def BlenderProg(self=None, builddir=None, progname=None, sources=None, libs=None, libpath=None, binarykind=''): global vcp print bc.HEADER+'Configuring program '+bc.ENDC+bc.OKGREEN+progname+bc.ENDC lenv = self.Clone() @@ -750,7 +750,6 @@ class BlenderEnvironment(SConsEnvironment): lenv.Append(LINKFLAGS = lenv['BF_OPENGL_LINKFLAGS']) if lenv['BF_PROFILE']: lenv.Append(LINKFLAGS = lenv['BF_PROFILE_LINKFLAGS']) - lenv.Append(CPPPATH=includes) if root_build_dir[0]==os.sep or root_build_dir[1]==':': lenv.Append(LIBPATH=root_build_dir + '/lib') lenv.Append(LIBPATH=libpath) |