Merge branch 'video-player' of /home/carl/git/dvdomatic into video-player

[dcpomatic.git] / src / wx / wscript

diff --git a/src/wx/wscript b/src/wx/wscript
index e5431460fe3573fe0933d281d6edb7653caff0dc..4dbb04eeacaa4cc0da3155f09e6243e5934b7dbb 100644 (file)
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -2,7 +2,11 @@ def configure(conf):
     conf.check_cfg(package = '', path = 'wx-config', args = '--cppflags --cxxflags --libs', uselib_store = 'WXWIDGETS', mandatory = True)
 
 def build(bld):
-    obj = bld(features = 'cxx cxxshlib')
+    if bld.env.STATIC:
+        obj = bld(features = 'cxx cxxstlib')
+    else:
+        obj = bld(features = 'cxx cxxshlib')
+
     obj.name   = 'libdvdomatic-wx'
     obj.includes = [ '..' ]
     obj.export_includes = ['.']
@@ -26,11 +30,4 @@ def build(bld):
                  wx_ui_signaller.cc
                  """
 
-#                 alignment.cc
-#                 film_list.cc
-#                 dvd_title_dialog.cc
-
-    if not bld.env.DISABLE_PLAYER:
-        obj.source += " film_player.cc"
-
     obj.target = 'dvdomatic-wx'