merge with/from trunk at r35190
[blender.git] / SConstruct
index 49c5ae98249124474ab74177c9ac985d62ca4d48..68170ef9c5bb52f52b54755b4f3e61e38f83fa37 100644 (file)
@@ -413,11 +413,18 @@ thesyslibs = B.setup_syslibs(env)
 if 'blender' in B.targets or not env['WITH_BF_NOBLENDER']:
     env.BlenderProg(B.root_build_dir, "blender", mainlist + thestatlibs + dobj, thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender')
 if env['WITH_BF_PLAYER']:
+<<<<<<< .working
+       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",  playerlist, thestatlibs + dobj + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blenderplayer')
+=======
     playerlist = B.create_blender_liblist(env, 'player')
     playerlist += B.create_blender_liblist(env, 'player2')
     playerlist += B.create_blender_liblist(env, 'intern')
     playerlist += B.create_blender_liblist(env, 'extern')
     env.BlenderProg(B.root_build_dir, "blenderplayer",  playerlist + thestatlibs + dobj, thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blenderplayer')
+>>>>>>> .merge-right.r35190
 
 ##### Now define some targets
 
@@ -615,11 +622,19 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'):
         else:
             dllsources.append('${BF_SDL_LIBPATH}/SDL.dll')
 
+<<<<<<< .working
+       if env['WITH_BF_PYTHON']:
+               if env['BF_DEBUG'] and not env["BF_NO_PYDEBUG"]:
+                       dllsources.append('${BF_PYTHON_LIBPATH}/${BF_PYTHON_DLL}_d.dll')
+               else:
+                       dllsources.append('${BF_PYTHON_LIBPATH}/${BF_PYTHON_DLL}.dll')
+=======
     if env['WITH_BF_PYTHON']:
         if env['BF_DEBUG']:
             dllsources.append('${BF_PYTHON_LIBPATH}/${BF_PYTHON_DLL}_d.dll')
         else:
             dllsources.append('${BF_PYTHON_LIBPATH}/${BF_PYTHON_DLL}.dll')
+>>>>>>> .merge-right.r35190
 
     if env['WITH_BF_ICONV']:
         if env['OURPLATFORM'] == 'win64-vc':