From 2a3d159b06be1c19541f21f5591566c94ab2735c Mon Sep 17 00:00:00 2001
From: Ken Hughes <khughes@pacific.edu>
Date: Mon, 28 Apr 2008 16:14:31 +0000
Subject: Add BF_X264_CONFIG and BF_XVIDCORE_CONFIG flags to scons, to allow
 passing configuration info for cross-compiling to ./configure scripts.  Also
 let makesdna use PLATFORM_LINKFLAGS.

---
 tools/btools.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'tools')

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
-- 
cgit v1.2.3