X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fwscript;h=b868292f583e6db60fa20eb22ed2d1c05620b433;hp=66c88f8d00e298a7b6239616318ac700f05be30a;hb=29f84e2b8785585885e0658bdf9938967547460f;hpb=19760ad4cf6d348416444e515b5e709be565f81e diff --git a/src/wx/wscript b/src/wx/wscript index 66c88f8d0..b868292f5 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -36,61 +36,69 @@ sources = """ check_box.cc christie_certificate_panel.cc cinema_dialog.cc + closed_captions_dialog.cc colour_conversion_editor.cc config_dialog.cc config_move_dialog.cc confirm_kdm_email_dialog.cc + content_advanced_dialog.cc content_colour_conversion_dialog.cc content_menu.cc content_panel.cc content_properties_dialog.cc content_sub_panel.cc + content_version_dialog.cc content_view.cc controls.cc - closed_captions_dialog.cc credentials_download_certificate_panel.cc + custom_scale_dialog.cc dcp_panel.cc - dcpomatic_button.cc - email_dialog.cc - image_sequence_dialog.cc - isdcf_metadata_dialog.cc dcp_text_track_dialog.cc + dcpomatic_button.cc + dcpomatic_spin_ctrl.cc dir_picker_ctrl.cc + disk_warning_dialog.cc + dkdm_dialog.cc + dkdm_output_panel.cc dolby_doremi_certificate_panel.cc download_certificate_dialog.cc download_certificate_panel.cc - export_dialog.cc + drive_wipe_warning_dialog.cc + email_dialog.cc + export_subtitles_dialog.cc + export_video_file_dialog.cc file_picker_ctrl.cc film_editor.cc film_name_location_dialog.cc film_viewer.cc filter_dialog.cc - filter_editor.cc focus_manager.cc fonts_dialog.cc full_config_dialog.cc + full_language_tag_dialog.cc gain_calculator_dialog.cc gdc_certificate_panel.cc gl_video_view.cc hints_dialog.cc html_dialog.cc - initial_setup_dialog.cc - instant_i18n_dialog.cc i18n_hook.cc + image_sequence_dialog.cc + instant_i18n_dialog.cc + interop_metadata_dialog.cc + job_manager_view.cc job_view.cc job_view_dialog.cc - job_manager_view.cc kdm_advanced_dialog.cc kdm_cpl_panel.cc kdm_dialog.cc kdm_output_panel.cc kdm_timing_panel.cc - key_dialog.cc + language_tag_dialog.cc + language_tag_widget.cc make_chain_dialog.cc markers_dialog.cc message_dialog.cc metadata_dialog.cc - monitor_dialog.cc move_to_dialog.cc nag_dialog.cc name_format_editor.cc @@ -108,6 +116,8 @@ sources = """ question_dialog.cc rating_dialog.cc qube_certificate_panel.cc + recipients_panel.cc + recipient_dialog.cc recreate_chain_dialog.cc repeat_dialog.cc report_problem_dialog.cc @@ -121,6 +131,7 @@ sources = """ server_dialog.cc servers_list_dialog.cc simple_video_view.cc + smpte_metadata_dialog.cc standard_controls.cc static_text.cc subtitle_appearance_dialog.cc @@ -146,8 +157,10 @@ sources = """ timeline_video_content_view.cc timeline_view.cc timing_panel.cc + try_unmount_dialog.cc update_dialog.cc verify_dcp_dialog.cc + verify_dcp_progress_dialog.cc video_panel.cc video_view.cc video_waveform_dialog.cc @@ -158,33 +171,42 @@ sources = """ def configure(conf): - wx_libs = 'core,richtext,adv,html,xml' + wx_libs = 'core,richtext,adv,html,xml,propgrid' - try: - wx_config = '/usr/lib64/wx/config/gtk2-unicode-3.0' - conf.check_cfg(msg='Checking for wxWidgets using gtk2-unicode-3.0', + if conf.options.wx_config is not None: + wx_config = conf.options.wx_config + conf.check_cfg(msg='Checking for wxWidgets using %s' % wx_config, package='', path=wx_config, args='--cppflags --cxxflags --libs %s --gl-libs' % wx_libs, uselib_store='WXWIDGETS', mandatory=True) - except: + else: try: - wx_config = 'wx-config-3.0-gtk2' - conf.check_cfg(msg='Checking for wxWidgets using wx-config-3.0-gtk2', + wx_config = '/usr/lib64/wx/config/gtk2-unicode-3.0' + conf.check_cfg(msg='Checking for wxWidgets using gtk2-unicode-3.0', package='', path=wx_config, args='--cppflags --cxxflags --libs %s --gl-libs' % wx_libs, uselib_store='WXWIDGETS', mandatory=True) except: - wx_config = 'wx-config' - conf.check_cfg(msg='Checking for wxWidgets using wx-config', - package='', - path=wx_config, - args='--cppflags --cxxflags --libs %s --gl-libs' % wx_libs, - uselib_store='WXWIDGETS', - mandatory=True) + try: + wx_config = 'wx-config-3.0-gtk2' + conf.check_cfg(msg='Checking for wxWidgets using wx-config-3.0-gtk2', + package='', + path=wx_config, + args='--cppflags --cxxflags --libs %s --gl-libs' % wx_libs, + uselib_store='WXWIDGETS', + mandatory=True) + except: + wx_config = 'wx-config' + conf.check_cfg(msg='Checking for wxWidgets using wx-config', + package='', + path=wx_config, + args='--cppflags --cxxflags --libs %s --gl-libs' % wx_libs, + uselib_store='WXWIDGETS', + mandatory=True) if conf.env.TARGET_LINUX: conf.env.append_value('CXXFLAGS', ['-DGLX_GLXEXT_PROTOTYPES']) @@ -192,7 +214,7 @@ def configure(conf): conf.env.append_value('CXXFLAGS', ['-DWGL_WGLEXT_PROTOTYPES']) if conf.options.static_wxwidgets: - # wx-config returns its static libraries as full paths, without -l prefixes, which confuses + # wx-config returns its static libraries as full paths, without -l prefixes, which confuses # check_cfg(). It puts the static libraries into LINKFLAGS_WXWIDGETS, so fish them out. stlibs = [] new_linkflags = [] @@ -212,9 +234,13 @@ def configure(conf): conf.in_msg = 1 wx_version = conf.check_cfg(package='wxwidgets', path=wx_config, args='--version').strip() - conf.im_msg = 0 - if not wx_version.startswith('3.0.'): - conf.fatal('wxwidgets version 3.0.x is required; %s found' % wx_version) + conf.in_msg = 0 + if not wx_version.startswith('3.'): + conf.fatal('wxwidgets version 3.x.y is required; %s found' % wx_version) + + config = conf.check_cfg(package='wxwidgets', path=wx_config, args='--selected-config').strip() + if config.find('gtk2') != -1: + conf.check_cfg(package='gtk+-2.0', args='--cflags --libs', uselib_store='GTK', mandatory=True) try: conf.check_cfg(msg='Checking for RtAudio using pkg-config', @@ -248,16 +274,6 @@ def configure(conf): conf.env.LIB_RTAUDIO.append('mfuuid') conf.env.LIB_RTAUDIO.append('wmcodecdspuuid') - conf.check_cxx(fragment=""" - #include \n - int main() { throw RtError("Hello"); } - """, - msg='Checking for RtError class', - use='RTAUDIO', - uselib_store='', - define_name='DCPOMATIC_USE_RTERROR', - mandatory=False) - if conf.env.TARGET_WINDOWS or conf.env.TARGET_LINUX: conf.check_cfg(package='gl', args='--cflags --libs', uselib_store='GL', mandatory=True) conf.check_cfg(package='glu', args='--cflags --libs', uselib_store='GLU', mandatory=True) @@ -299,10 +315,7 @@ def build(bld): if bld.env.TARGET_OSX: obj.framework = ['CoreAudio', 'OpenGL'] obj.use = 'libdcpomatic2' - if not len(bld.env.VARIANT) == 0 and bld.env.VARIANT.startswith('swaroop-'): - obj.source = sources + " swaroop_controls.cc" - else: - obj.source = sources + obj.source = sources obj.target = 'dcpomatic2-wx' i18n.po_to_mo(os.path.join('src', 'wx'), 'libdcpomatic2-wx', bld)