X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fwscript;h=816f5a63fb4a88ea35f7ca7197cc87a8d5ad426f;hb=b7e546d9685c0a3304faa48e95516915d811ec5c;hp=b5210bacee2a91d226d24c4174ddb63ac4cd9307;hpb=661245c262558da01b6c587b94bc975d9f78e8e1;p=dcpomatic.git diff --git a/src/wx/wscript b/src/wx/wscript index b5210bace..816f5a63f 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -1,5 +1,5 @@ # -# Copyright (C) 2012-2015 Carl Hetherington +# Copyright (C) 2012-2019 Carl Hetherington # # This file is part of DCP-o-matic. # @@ -31,7 +31,10 @@ sources = """ audio_mapping_view.cc audio_panel.cc audio_plot.cc + barco_alchemy_certificate_panel.cc batch_job_view.cc + check_box.cc + christie_certificate_panel.cc cinema_dialog.cc colour_conversion_editor.cc config_dialog.cc @@ -42,10 +45,15 @@ sources = """ content_panel.cc content_properties_dialog.cc content_sub_panel.cc + content_view.cc + controls.cc + closed_captions_dialog.cc dcp_panel.cc + dcpomatic_button.cc email_dialog.cc image_sequence_dialog.cc isdcf_metadata_dialog.cc + dcp_text_track_dialog.cc dir_picker_ctrl.cc dolby_doremi_certificate_panel.cc download_certificate_dialog.cc @@ -59,10 +67,14 @@ sources = """ filter_editor.cc focus_manager.cc fonts_dialog.cc - font_files_dialog.cc full_config_dialog.cc gain_calculator_dialog.cc + gdc_certificate_panel.cc hints_dialog.cc + html_dialog.cc + initial_setup_dialog.cc + instant_i18n_dialog.cc + i18n_hook.cc job_view.cc job_view_dialog.cc job_manager_view.cc @@ -73,17 +85,23 @@ sources = """ kdm_timing_panel.cc key_dialog.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 new_dkdm_folder_dialog.cc normal_job_view.cc paste_dialog.cc + password_entry.cc player_config_dialog.cc player_information.cc playhead_to_timecode_dialog.cc playhead_to_frame_dialog.cc question_dialog.cc + rating_dialog.cc recreate_chain_dialog.cc repeat_dialog.cc report_problem_dialog.cc @@ -93,15 +111,19 @@ sources = """ screen_dialog.cc screens_panel.cc self_dkdm_dialog.cc + send_i18n_dialog.cc server_dialog.cc servers_list_dialog.cc + standard_controls.cc + static_text.cc subtitle_appearance_dialog.cc - subtitle_panel.cc - subtitle_view.cc system_font_dialog.cc table_dialog.cc templates_dialog.cc + text_panel.cc + text_view.cc time_picker.cc + timer_display.cc timecode.cc timeline.cc timeline_atmos_content_view.cc @@ -109,7 +131,7 @@ sources = """ timeline_dialog.cc timeline_audio_content_view.cc timeline_labels_view.cc - timeline_subtitle_content_view.cc + timeline_text_content_view.cc timeline_reels_view.cc timeline_time_axis_view.cc timeline_video_content_view.cc @@ -125,12 +147,15 @@ sources = """ """ def configure(conf): + + wx_libs = 'core,richtext,adv,html,xml' + try: 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 std,richtext', + args='--cppflags --cxxflags --libs %s' % wx_libs, uselib_store='WXWIDGETS', mandatory=True) except: @@ -139,7 +164,7 @@ def configure(conf): conf.check_cfg(msg='Checking for wxWidgets using wx-config-3.0-gtk2', package='', path=wx_config, - args='--cppflags --cxxflags --libs std,richtext', + args='--cppflags --cxxflags --libs %s' % wx_libs, uselib_store='WXWIDGETS', mandatory=True) except: @@ -147,7 +172,7 @@ def configure(conf): conf.check_cfg(msg='Checking for wxWidgets using wx-config', package='', path=wx_config, - args='--cppflags --cxxflags --libs std,richtext', + args='--cppflags --cxxflags --libs %s' % wx_libs, uselib_store='WXWIDGETS', mandatory=True) @@ -171,7 +196,7 @@ def configure(conf): conf.env.STLIBPATH_WXWIDGETS = stlib_paths conf.in_msg = 1 - wx_version = conf.check_cfg(package='', path=wx_config, args='--version').strip() + 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) @@ -199,18 +224,21 @@ def configure(conf): # Some rtaudio-configs don't include rtaudio as a link library. Go figure. conf.env.LIB_RTAUDIO.append('rtaudio') - # Don't explicitly link with pthread on Windows if conf.env.TARGET_WINDOWS: + # Don't explicitly link with pthread on Windows conf.env.CFLAGS_RTAUDIO.remove('-pthread') conf.env.LINKFLAGS_RTAUDIO.remove('-pthread') + # We need some libraries for WASAPI + conf.env.LIB_RTAUDIO.append('mfplat') + 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', - libpath='/usr/local/lib', - lib=['rtaudio'], + use='RTAUDIO', uselib_store='', define_name='DCPOMATIC_USE_RTERROR', mandatory=False) @@ -233,7 +261,10 @@ def build(bld): if bld.env.TARGET_OSX: obj.framework = ['CoreAudio'] obj.use = 'libdcpomatic2' - obj.source = sources + if bld.env.VARIANT == 'swaroop': + obj.source = sources + " swaroop_controls.cc" + else: + obj.source = sources obj.target = 'dcpomatic2-wx' i18n.po_to_mo(os.path.join('src', 'wx'), 'libdcpomatic2-wx', bld)