==SCons==

+ BF_BUILDINFO=1 (by default) for build info in splash
- remove redundant renderconverter include dir
* check for win32-vc instead of only win32, so MingW compile goes ok

diff --git a/intern/elbeem/SConscript b/intern/elbeem/SConscript
index 45050aff599cf347b9757dbbce5673f6e47b7dcd..def5910cf2d0abc588367546898247c17ac1f74a 100644 (file)
--- a/intern/elbeem/SConscript
+++ b/intern/elbeem/SConscript
@@ -16,7 +16,7 @@ Import('env')
 sources = env.Glob('intern/*.cpp')
 
 defs = 'NOGUI ELBEEM_BLENDER=1'
-if sys.platform=='win32':
+if env['OURPLATFORM']=='win32-vc':
     defs += ' USE_MSVC6FIXES'
 incs = env['BF_PNG_INC'] + ' ' + env['BF_ZLIB_INC'] + ' ' +env['BF_SDL_INC']
 

diff --git a/source/blender/src/SConscript b/source/blender/src/SConscript
index 1243e81609fd9ad664b83a69d420a566019c51e1..5f746ae65665db3ff7db87a634d8802d658657b5 100644 (file)
--- a/source/blender/src/SConscript
+++ b/source/blender/src/SConscript
@@ -7,7 +7,7 @@ sources = env.Glob('*.c')
 
 incs = ' #/intern/guardedalloc ../blenlib ../makesdna ../blenkernel'
 incs += ' ../include #/intern/bmfont ../imbuf ../render/extern/include'
-incs += ' #/intern/bsp/extern ../renderconverter ../radiosity/extern/include'
+incs += ' #/intern/bsp/extern ../radiosity/extern/include'
 incs += ' #/intern/decimation/extern ../blenloader ../python'
 incs += ' ../../kernel/gen_system #/intern/SoundSystem ../readstreamglue'
 incs += ' ../img ../quicktime #/intern/elbeem/extern'
@@ -32,7 +32,7 @@ if env['WITH_BF_QUICKTIME']==1:
     defs.append('WITH_QUICKTIME')
 
 # TODO buildinfo
-#if env['USE_BUILDINFO'] == 1:
-#    defs += ' NAN_BUILDINFO'
+if env['BF_BUILDINFO'] == 1:
+    defs.append('NAN_BUILDINFO')
 
 env.BlenderLib ( libname = 'src', sources = sources, includes = Split(incs), defines = defs, libtype=['core', 'intern'], priority = [5, 25] )

diff --git a/tools/Blender.py b/tools/Blender.py
index 2c761ca4a18d21ff7066ec8a423cd223f7d912a9..10865e3fbc6ee887d3241864a31ca1b1a1aeca20 100644 (file)
--- a/tools/Blender.py
+++ b/tools/Blender.py
@@ -171,7 +171,7 @@ def buildinfo(lenv, build_type):
     build_date = time.strftime ("%Y-%m-%d")
     build_time = time.strftime ("%H:%M:%S")
     obj = []
-    if True: #user_options_dict['USE_BUILDINFO'] == 1:
+    if lenv['BF_BUILDINFO']==1: #user_options_dict['USE_BUILDINFO'] == 1:
         if sys.platform=='win32':
             build_info_file = open("source/creator/winbuildinfo.h", 'w')
             build_info_file.write("char *build_date=\"%s\";\n"%build_date)

diff --git a/tools/btools.py b/tools/btools.py
index fbfe78854997b0d2337bfd7b672e09fbb229b9bb..ee6dfbf54f3820803482c0942db1e2eb92c42a6d 100755 (executable)
--- a/tools/btools.py
+++ b/tools/btools.py
@@ -41,7 +41,7 @@ def validate_arguments(args, bc):
     arg_list = ['BF_DEBUG', 'BF_QUIET', 'BF_CROSS', 'BF_UPDATE',
             'BF_INSTALLDIR', 'BF_TOOLSET', 'BF_BINNAME',
             'BF_BUILDDIR', 'BF_FANCY', 'BF_QUICK', 'BF_PROFILE', 'BF_DEBUG',
-            'BF_PRIORITYLIST'
+            'BF_PRIORITYLIST', 'BF_BUILDINFO'
            ]
 
     all_list = opts_list + arg_list
@@ -249,7 +249,9 @@ def read_opts(cfg, args):
         ('BF_DEBUG_FLAGS', 'Debug flags', ''),
         
         ('BF_BUILDDIR', 'Build dir', ''),
-        ('BF_INSTALLDIR', 'Installation dir', '')
+        ('BF_INSTALLDIR', 'Installation dir', ''),
+
+        (BoolOption('BF_BUILDINFO', 'Buildtime in splash if true', 'true'))
 
     ) # end of opts.AddOptions()