X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fwscript;h=d2b4e58e228858287514c955fce0050aa2d3063f;hb=7861a2f4fe15952d43323a64284afd71427d09f4;hp=d72c209401ec756c64ce52787535d4768402a057;hpb=d97029163865e212dc3d7b3c57c16459933a11f6;p=dcpomatic.git diff --git a/src/wx/wscript b/src/wx/wscript index d72c20940..d2b4e58e2 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -1,5 +1,5 @@ # -# Copyright (C) 2012-2019 Carl Hetherington +# Copyright (C) 2012-2022 Carl Hetherington # # This file is part of DCP-o-matic. # @@ -36,6 +36,7 @@ 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 @@ -49,23 +50,21 @@ sources = """ 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 - disk_warning_dialog.cc - dkdm_output_panel.cc - drive_wipe_warning_dialog.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 + drive_wipe_warning_dialog.cc + email_dialog.cc export_subtitles_dialog.cc export_video_file_dialog.cc file_picker_ctrl.cc @@ -76,28 +75,32 @@ sources = """ 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 + i18n_hook.cc + image_sequence_dialog.cc instant_i18n_dialog.cc interop_metadata_dialog.cc - i18n_hook.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 language_tag_dialog.cc + language_tag_widget.cc + kdm_choice.cc make_chain_dialog.cc + markers.cc markers_dialog.cc message_dialog.cc - monitor_dialog.cc + metadata_dialog.cc move_to_dialog.cc nag_dialog.cc name_format_editor.cc @@ -127,6 +130,7 @@ sources = """ screens_panel.cc self_dkdm_dialog.cc send_i18n_dialog.cc + send_test_email_dialog.cc server_dialog.cc servers_list_dialog.cc simple_video_view.cc @@ -159,6 +163,7 @@ sources = """ 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 @@ -171,35 +176,44 @@ def configure(conf): 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']) - if conf.env.TARGET_WINDOWS: + conf.env.append_value('CXXFLAGS', ['-DGL_GLEXT_PROTOTYPES', '-DGLX_GLXEXT_PROTOTYPES']) + if conf.env.TARGET_WINDOWS_64 or conf.env.TARGET_WINDOWS_32: conf.env.append_value('CXXFLAGS', ['-DWGL_WGLEXT_PROTOTYPES']) if conf.options.static_wxwidgets: @@ -254,7 +268,7 @@ def configure(conf): # Some rtaudio-configs don't include rtaudio as a link library. Go figure. conf.env.LIB_RTAUDIO.append('rtaudio') - if conf.env.TARGET_WINDOWS: + if conf.env.TARGET_WINDOWS_64 or conf.env.TARGET_WINDOWS_32: # Don't explicitly link with pthread on Windows conf.env.CFLAGS_RTAUDIO.remove('-pthread') conf.env.LINKFLAGS_RTAUDIO.remove('-pthread') @@ -263,19 +277,11 @@ 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: + if conf.env.TARGET_WINDOWS_64 or conf.env.TARGET_WINDOWS_32 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) + if conf.env.TARGET_WINDOWS_64 or conf.env.TARGET_WINDOWS_32: + conf.check_cfg(package='glew', args='--cflags --libs', uselib_store='GLEW', mandatory=True) else: conf.env.STLIB_GL = 'gl' conf.env.STLIB_GLU = 'glu' @@ -306,18 +312,15 @@ def build(bld): obj.name = 'libdcpomatic2-wx' obj.export_includes = ['..'] - obj.uselib = 'BOOST_FILESYSTEM BOOST_THREAD BOOST_REGEX WXWIDGETS DCP SUB ZIP CXML RTAUDIO ' + obj.uselib = 'BOOST_FILESYSTEM BOOST_THREAD BOOST_REGEX WXWIDGETS DCP SUB ZIP CXML RTAUDIO ICU ' if bld.env.TARGET_LINUX: obj.uselib += 'GTK GL GLU ' - if bld.env.TARGET_WINDOWS: - obj.uselib += 'WINSOCK2 OLE32 DSOUND WINMM KSUSER GL GLU ' + if bld.env.TARGET_WINDOWS_64 or bld.env.TARGET_WINDOWS_32: + obj.uselib += 'WINSOCK2 OLE32 DSOUND WINMM KSUSER GL GLU GLEW ' 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)