diff options
| -rw-r--r-- | source/blender/makesdna/intern/SConscript | 1 | ||||
| -rwxr-xr-x | tools/btools.py | 10 |
2 files changed, 9 insertions, 2 deletions
diff --git a/source/blender/makesdna/intern/SConscript b/source/blender/makesdna/intern/SConscript index 872fd515f1d..574e289d3a9 100644 --- a/source/blender/makesdna/intern/SConscript +++ b/source/blender/makesdna/intern/SConscript @@ -25,6 +25,7 @@ if sys.platform != 'cygwin': makesdna_tool.Append (CCFLAGS = cflags) makesdna_tool.Append (CPPDEFINES = defines) makesdna_tool.Append (LIBPATH = '#'+root_build_dir+'/lib') +makesdna_tool.Append (LINKFLAGS = env['PLATFORM_LINKFLAGS']) if env['BF_PROFILE']: makesdna_tool.Append (LINKFLAGS = env['BF_PROFILE_FLAGS']) diff --git a/tools/btools.py b/tools/btools.py index 8e195de2727..51367d6bd42 100755 --- a/tools/btools.py +++ b/tools/btools.py @@ -63,14 +63,17 @@ def validate_arguments(args, bc): 'WITHOUT_BF_INSTALL', 'WITH_BF_OPENMP', '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', 'BF_INSTALLDIR', 'BF_TOOLSET', 'BF_BINNAME', 'BF_BUILDDIR', 'BF_FANCY', 'BF_QUICK', 'BF_PROFILE', '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 okdict = {} @@ -315,6 +318,9 @@ def read_opts(cfg, args): (BoolOption('BF_QUIET', 'Enable silent output if true', 'true')), (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() return localopts |