forked from bartvdbraak/blender
==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
This commit is contained in:
parent
41356305ee
commit
4e82647e86
@ -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']
|
||||
|
||||
|
@ -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] )
|
||||
|
@ -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)
|
||||
|
@ -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()
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user