Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Add BF_X264_CONFIG and BF_XVIDCORE_CONFIG flags to scons, to allow passing

Browse Source 
configuration info for cross-compiling to ./configure scripts.  Also let
makesdna use PLATFORM_LINKFLAGS.
This commit is contained in:
Ken Hughes
2008-04-28 16:14:31 +00:00
parent c6554898cc
commit 2a3d159b06
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/makesdna/intern/SConscript
View File

@@ -25,6 +25,7 @@ if sys.platform != 'cygwin':
makesdna_tool.Append (CCFLAGS = cflags) makesdna_tool.Append (CCFLAGS = cflags)
makesdna_tool.Append (CPPDEFINES = defines) makesdna_tool.Append (CPPDEFINES = defines)
makesdna_tool.Append (LIBPATH = '#'+root_build_dir+'/lib') makesdna_tool.Append (LIBPATH = '#'+root_build_dir+'/lib')
makesdna_tool.Append (LINKFLAGS = env['PLATFORM_LINKFLAGS'])
if env['BF_PROFILE']: if env['BF_PROFILE']:
makesdna_tool.Append (LINKFLAGS = env['BF_PROFILE_FLAGS']) makesdna_tool.Append (LINKFLAGS = env['BF_PROFILE_FLAGS'])

10
tools/btools.py
View File

@@ -63,14 +63,17 @@ def validate_arguments(args, bc):
'WITHOUT_BF_INSTALL', 'WITHOUT_BF_INSTALL',
'WITH_BF_OPENMP', 'WITH_BF_OPENMP',
'WITHOUT_BF_INSTALL', 'WITHOUT_BF_INSTALL',
'BF_FANCY', 'BF_QUIET' 'BF_FANCY', 'BF_QUIET',
'BF_X264_CONFIG',
'BF_XVIDCORE_CONFIG',
] ]
arg_list = ['BF_DEBUG', 'BF_QUIET', 'BF_CROSS', 'BF_UPDATE', arg_list = ['BF_DEBUG', 'BF_QUIET', 'BF_CROSS', 'BF_UPDATE',
'BF_INSTALLDIR', 'BF_TOOLSET', 'BF_BINNAME', 'BF_INSTALLDIR', 'BF_TOOLSET', 'BF_BINNAME',
'BF_BUILDDIR', 'BF_FANCY', 'BF_QUICK', 'BF_PROFILE', 'BF_BUILDDIR', 'BF_FANCY', 'BF_QUICK', 'BF_PROFILE',
'BF_DEBUG_FLAGS', 'BF_BSC', 'BF_CONFIG', 'BF_DEBUG_FLAGS', 'BF_BSC', 'BF_CONFIG',
'BF_PRIORITYLIST', 'BF_BUILDINFO','CC', 'CXX', "BF_QUICKDEBUG", "BF_LISTDEBUG", 'LCGDIR'] 'BF_PRIORITYLIST', 'BF_BUILDINFO','CC', 'CXX', 'BF_QUICKDEBUG',
'BF_LISTDEBUG', 'LCGDIR', 'BF_X264_CONFIG', 'BF_XVIDCORE_CONFIG']
all_list = opts_list + arg_list all_list = opts_list + arg_list
okdict = {} okdict = {}
@@ -315,6 +318,9 @@ def read_opts(cfg, args):
(BoolOption('BF_QUIET', 'Enable silent output if true', 'true')), (BoolOption('BF_QUIET', 'Enable silent output if true', 'true')),
(BoolOption('WITH_BF_BINRELOC', 'Enable relocatable binary (linux only)', 'false')), (BoolOption('WITH_BF_BINRELOC', 'Enable relocatable binary (linux only)', 'false')),
('BF_X264_CONFIG', 'configuration flags for x264', ''),
('BF_XVIDCORE_CONFIG', 'configuration flags for xvidcore', ''),
) # end of opts.AddOptions() ) # end of opts.AddOptions()
return localopts return localopts