Remove configuration of servers.

[dcpomatic.git] / src / wx / wscript

diff --git a/src/wx/wscript b/src/wx/wscript
index 7dcb945b76a260f27e9663205bcd63796823fa51..85bb697ab915a3e67a9894477a6ade5a98235421 100644 (file)
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -7,30 +7,46 @@ sources = """
           about_dialog.cc
           audio_dialog.cc
           audio_mapping_view.cc
+          audio_panel.cc
           audio_plot.cc
+          cinema_dialog.cc
+          colour_conversion_editor.cc
           config_dialog.cc
+          content_colour_conversion_dialog.cc
+          content_menu.cc
           dci_metadata_dialog.cc
           dir_picker_ctrl.cc
           film_editor.cc
+          film_editor_panel.cc
           film_viewer.cc
           filter_dialog.cc
-          filter_view.cc
+          filter_editor.cc
           gain_calculator_dialog.cc
-          imagemagick_content_dialog.cc
           job_manager_view.cc
           job_wrapper.cc
+          kdm_dialog.cc
           new_film_dialog.cc
+          preset_colour_conversion_dialog.cc
           properties_dialog.cc
-          server_dialog.cc
+          repeat_dialog.cc
+          screen_dialog.cc
+          servers_list_dialog.cc
+          subtitle_panel.cc
           timecode.cc
           timeline.cc
           timeline_dialog.cc
+          timing_panel.cc
+          video_panel.cc
           wx_util.cc
           wx_ui_signaller.cc
           """
 
 def configure(conf):
-    conf.check_cfg(msg='Checking for wxWidgets', package='', path=conf.options.wx_config, args='--cppflags --cxxflags --libs',
+    args = '--cppflags --cxxflags'
+    if not conf.env.STATIC:
+        args += ' --libs'
+
+    conf.check_cfg(msg='Checking for wxWidgets', package='', path=conf.options.wx_config, args=args,
                    uselib_store='WXWIDGETS', mandatory=True)
 
     if conf.env.STATIC:
@@ -43,8 +59,8 @@ def configure(conf):
     conf.in_msg = 1
     wx_version = conf.check_cfg(package='', path=conf.options.wx_config, args='--version').strip()
     conf.im_msg = 0
-    if wx_version != '2.9.4':
-        conf.fatal('wxwidgets version 2.9.4 is required; %s found' % wx_version)
+    if wx_version != '2.9.4' and wx_version != '2.9.5':
+        conf.fatal('wxwidgets version 2.9.4 or 2.9.5 is required; %s found' % wx_version)
 
 def build(bld):
     if bld.env.STATIC:
@@ -53,8 +69,7 @@ def build(bld):
         obj = bld(features = 'cxx cxxshlib')
 
     obj.name   = 'libdcpomatic-wx'
-    obj.includes = [ '..' ]
-    obj.export_includes = ['.']
+    obj.export_includes = ['..']
     obj.uselib = 'WXWIDGETS'
     if bld.env.TARGET_LINUX:
         obj.uselib += ' GTK'