X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fwscript;h=83e2022b3bb9728a61f2c2f48edeef71d7d7a303;hp=66b928247c3eadb5cda91e0c89550a0486f5b74f;hb=9e67ff28e3ccd3a3e51e62f400455c7046f8b6bd;hpb=9bf9d637a6fd105418c0af84727ba68823142943 diff --git a/src/wx/wscript b/src/wx/wscript index 66b928247..83e2022b3 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,22 +31,37 @@ 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 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_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 dir_picker_ctrl.cc + dkdm_dialog.cc dolby_doremi_certificate_panel.cc download_certificate_dialog.cc download_certificate_panel.cc @@ -57,27 +72,51 @@ sources = """ film_viewer.cc filter_dialog.cc 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 + gl_video_view.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 + kdm_advanced_dialog.cc kdm_cpl_panel.cc kdm_dialog.cc kdm_output_panel.cc 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 + player_stress_tester.cc playhead_to_timecode_dialog.cc playhead_to_frame_dialog.cc + playlist_controls.cc + playlist_editor_config_dialog.cc 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 rename_template_dialog.cc @@ -86,15 +125,22 @@ sources = """ screen_dialog.cc screens_panel.cc self_dkdm_dialog.cc + send_i18n_dialog.cc server_dialog.cc servers_list_dialog.cc + simple_video_view.cc + standard_controls.cc + static_text.cc subtitle_appearance_dialog.cc - subtitle_panel.cc - subtitle_view.cc + suspender.cc system_font_dialog.cc + system_information_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 @@ -102,14 +148,17 @@ 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 timeline_view.cc timing_panel.cc + try_unmount_dialog.cc update_dialog.cc + verify_dcp_dialog.cc video_panel.cc + video_view.cc video_waveform_dialog.cc video_waveform_plot.cc wx_util.cc @@ -117,25 +166,42 @@ sources = """ """ def configure(conf): + + wx_libs = 'core,richtext,adv,html,xml,propgrid' + 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 std,richtext', + 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 std,richtext', - 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', ['-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 = [] @@ -154,7 +220,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) @@ -182,22 +248,48 @@ 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) + 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) + else: + conf.env.STLIB_GL = 'gl' + conf.env.STLIB_GLU = 'glu' + + if conf.env.TARGET_LINUX: + conf.check_cxx(fragment=""" + #include + #include + #include + #include + int main() { + glXSwapIntervalEXT (0, 0, 1); + return 0; + } + """, + msg='Checking for glXSwapIntervalEXT', + okmsg='yes', + uselib='GL WXWIDGETS', + define_name='DCPOMATIC_HAVE_GLX_SWAP_INTERVAL_EXT', + mandatory=False) def build(bld): @@ -210,13 +302,16 @@ def build(bld): obj.export_includes = ['..'] obj.uselib = 'BOOST_FILESYSTEM BOOST_THREAD BOOST_REGEX WXWIDGETS DCP SUB ZIP CXML RTAUDIO ' if bld.env.TARGET_LINUX: - obj.uselib += 'GTK ' + obj.uselib += 'GTK GL GLU ' if bld.env.TARGET_WINDOWS: - obj.uselib += 'WINSOCK2 OLE32 DSOUND WINMM KSUSER ' + obj.uselib += 'WINSOCK2 OLE32 DSOUND WINMM KSUSER GL GLU ' if bld.env.TARGET_OSX: - obj.framework = ['CoreAudio'] + obj.framework = ['CoreAudio', 'OpenGL'] obj.use = 'libdcpomatic2' - obj.source = sources + if not len(bld.env.VARIANT) == 0 and bld.env.VARIANT.startswith('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)