[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20818] branches/blender2.5/blender: don' t build game engine by default, and print a warning if game player is enabled.

[Joseph Eagar]

Revision: 20818
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20818
Author:   joeedh
Date:     2009-06-11 22:47:14 +0200 (Thu, 11 Jun 2009)

Log Message:
-----------
don't build game engine by default, and print a warning if game player is enabled.

Modified Paths:
--------------
    branches/blender2.5/blender/SConstruct
    branches/blender2.5/blender/tools/btools.py

Modified: branches/blender2.5/blender/SConstruct
===================================================================
--- branches/blender2.5/blender/SConstruct	2009-06-11 18:58:37 UTC (rev 20817)
+++ branches/blender2.5/blender/SConstruct	2009-06-11 20:47:14 UTC (rev 20818)
@@ -404,6 +404,9 @@
 thestatlibs, thelibincs = B.setup_staticlibs(env)
 thesyslibs = B.setup_syslibs(env)
 
+if env['WITH_BF_PLAYER']:
+	print("Warning: Game player may not build on 2.5")
+
 if 'blender' in B.targets or not env['WITH_BF_NOBLENDER']:
 	#env.BlenderProg(B.root_build_dir, "blender", dobj , [], mainlist + thestatlibs + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender')
 	env.BlenderProg(B.root_build_dir, "blender", dobj + mainlist, [], thestatlibs + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender')

Modified: branches/blender2.5/blender/tools/btools.py
===================================================================
--- branches/blender2.5/blender/tools/btools.py	2009-06-11 18:58:37 UTC (rev 20817)
+++ branches/blender2.5/blender/tools/btools.py	2009-06-11 20:47:14 UTC (rev 20818)
@@ -157,7 +157,7 @@
 		(BoolVariable('WITH_BF_STATICPYTHON', 'Staticly link to python', False)),
 
 		(BoolVariable('BF_NO_ELBEEM', 'Disable Fluid Sim', False)),
-
+		('BF_PROFILE_FLAGS', 'Profiling compiler flags', ''),
 		(BoolVariable('WITH_BF_OPENAL', 'Use OpenAL if true', False)),
 		('BF_OPENAL', 'base path for OpenAL', ''),
 		('BF_OPENAL_INC', 'include path for python headers', ''),
@@ -248,7 +248,7 @@
 		('BF_ICONV_LIB', 'iconv library', ''),
 		('BF_ICONV_LIBPATH', 'iconv library path', ''),
 		
-		(BoolVariable('WITH_BF_GAMEENGINE', 'Build with gameengine' , True)),
+		(BoolVariable('WITH_BF_GAMEENGINE', 'Build with gameengine' , False)),
 
 		(BoolVariable('WITH_BF_ODE', 'Use ODE if true', True)),
 		('BF_ODE', 'ODE base path', ''),