merge with/from trunk at r35190
[blender.git] / source / gameengine / VideoTexture / SConscript
index 21a5f8ce3fe5b982547ea65425323a44998e4b7d..94209f858232a2e2178cf96467bd031ef6b456a6 100644 (file)
@@ -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'])