X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fwscript;h=8f35e2facea49aa784b761ef4dbb3cc341f3b537;hb=1471992231cd78c56be79a1cb01865fc2c80c686;hp=09ce0218db1fc1b63d1b31019214c94486f83d42;hpb=bd453939da140ea994282e1c167ea5f8d02e2d94;p=dcpomatic.git diff --git a/src/wx/wscript b/src/wx/wscript index 09ce0218d..8f35e2fac 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -7,25 +7,36 @@ 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 - still_image_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 repeat_dialog.cc + screen_dialog.cc server_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 """ @@ -48,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: