diff options
Diffstat (limited to 'source/gameengine/VideoTexture/SConscript')
| -rw-r--r-- | source/gameengine/VideoTexture/SConscript | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/gameengine/VideoTexture/SConscript b/source/gameengine/VideoTexture/SConscript index 21a5f8ce3fe..94209f85823 100644 --- a/source/gameengine/VideoTexture/SConscript +++ b/source/gameengine/VideoTexture/SConscript @@ -20,12 +20,17 @@ if env['OURPLATFORM'] in ('win32-vc', 'win64-vc','win32-mingw'): defs.append('_DEBUG') if env['WITH_BF_PYTHON']: +<<<<<<< .working incs += ' ' + env['BF_PYTHON_INC'] else: defs.append('DISABLE_PYTHON') +======= + incs += ' ' + env['BF_PYTHON_INC'] + defs.append('WITH_PYTHON') +>>>>>>> .merge-right.r35190 if env['WITH_BF_FFMPEG']: defs.append('WITH_FFMPEG') incs += ' ' + env['BF_FFMPEG_INC'] + ' ' + env['BF_PTHREADS_INC'] -env.BlenderLib ( 'bf_videotex', sources, Split(incs), defs, libtype=['core','player'], priority=[340,205], cxx_compileflags=env['BGE_CXXFLAGS']) +env.BlenderLib ( 'ge_videotex', sources, Split(incs), defs, libtype=['core','player'], priority=[340,205], cxx_compileflags=env['BGE_CXXFLAGS']) |