diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2008-12-16 14:26:55 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2008-12-16 14:26:55 +0300 |
| commit | 4da3c4b9d5ede4369467165cb9f31eee4385a353 (patch) | |
| tree | 7104369b4324bbb484947a892acd98646b78d4a6 /source | |
| parent | 024b4b3dda2c6e4acb3fb111fdee4de82215d6ea (diff) | |
fix for [bf-blender-Bug Tracker][18089] scons compiling bug
and removed unused vars
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/python/api2_2x/Sys.c | 3 | ||||
| -rw-r--r-- | source/gameengine/GamePlayer/ghost/SConscript | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/python/api2_2x/Sys.c b/source/blender/python/api2_2x/Sys.c index c438d2c6e54..936014d87ed 100644 --- a/source/blender/python/api2_2x/Sys.c +++ b/source/blender/python/api2_2x/Sys.c @@ -427,9 +427,6 @@ static PyObject *M_sys_relpath( PyObject * self, PyObject * args ) char *path; char relpath[FILE_MAXDIR + FILE_MAXFILE]; - char dir[FILE_MAXDIR]; - char file[FILE_MAXFILE]; - if( !PyArg_ParseTuple( args, "s|s:Blender.sys.relpath", &path, &base ) ) return NULL; diff --git a/source/gameengine/GamePlayer/ghost/SConscript b/source/gameengine/GamePlayer/ghost/SConscript index c1559f6e1fc..4f1324b3938 100644 --- a/source/gameengine/GamePlayer/ghost/SConscript +++ b/source/gameengine/GamePlayer/ghost/SConscript @@ -49,7 +49,8 @@ cflags = [] if env['OURPLATFORM']=='win32-vc': cflags = ['/GR'] +defs = '' if env['WITH_BF_FFMPEG']: defs += ' WITH_FFMPEG' -env.BlenderLib (libname='gp_ghost', sources=source_files, includes = incs, defines = [], libtype='player',priority=0, compileflags=cflags) +env.BlenderLib (libname='gp_ghost', sources=source_files, includes = incs, defines = Split(defs), libtype='player',priority=0, compileflags=cflags) |