From 1f55d28973d8305d9e04df869ef6e97b36f4e391 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Alex=20R=C3=B8nne=20Petersen?= <alex@lycus.org>
Date: Thu, 20 Sep 2012 20:29:15 +0000
Subject: [PATCH] Add --static option to allow building a static library.

Also fix source search paths that I screwed up in a previous commit.
---
 wscript | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/wscript b/wscript
index ce156ed..d1da8b1 100644
--- a/wscript
+++ b/wscript
@@ -15,6 +15,7 @@ def options(opt):
     opt.load('qt4')
 
     opt.add_option('--mode', action = 'store', default = 'debug', help = 'the mode to compile in (debug/release)')
+    opt.add_option('--static', action = 'store', default = 'false', help = 'build a static library (true/false)')
 
 def configure(conf):
     def add_options(flags, options):
@@ -100,15 +101,24 @@ def configure(conf):
     else:
         conf.fatal('--mode must be either debug or release.')
 
+    conf.env.STATIC = conf.options.static
+
+    if not conf.env.STATIC in ['true', 'false']:
+        conf.fatal('--static must be either true or false.')
+
     conf.check_cxx(lib = 'avutil')
     conf.check_cxx(lib = 'swscale')
 
 def build(bld):
     def search_paths(paths):
+        srcpaths = []
+
         for path in paths:
-            return [os.path.join(path, '*.c'),
-                    os.path.join(path, '*.cpp'),
-                    os.path.join(path, '*.asm')]
+            srcpaths += [os.path.join(path, '*.c'),
+                         os.path.join(path, '*.cpp'),
+                         os.path.join(path, '*.asm')]
+
+        return srcpaths
 
     sources = search_paths([os.path.join('src', 'core'),
                             os.path.join('src', 'core', 'asm')])
@@ -116,8 +126,16 @@ def build(bld):
     if bld.env.DEST_OS == 'win32':
         sources += search_paths([os.path.join('src', 'avisynth')])
 
-    bld(features = 'c qxx asm cxxshlib',
+    bld(features = 'c qxx asm',
         includes = 'include',
         source = bld.path.ant_glob(sources),
-        use = ['QTCORE', 'AVUTIL', 'SWSCALE'],
+        target = 'objs')
+
+    bld(features = 'c qxx asm cxxshlib',
+        use = 'objs',
         target = 'vapoursynth')
+
+    if bld.env.STATIC == 'true':
+        bld(features = 'c qxx asm cxxstlib',
+            use = 'objs',
+            target = 'vapoursynth')
-- 
2.11.4.GIT