X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fwscript;h=88987f1bf5db6346b2994d4c2b844a2e87e6bfc0;hp=7679406e6d6b3cdd11b2edc31198858d6260656f;hb=6743eacf57a1209270f4021684425865bb72b00f;hpb=c7b12a252f490ecf5e456f479c6fecb1aefba05d diff --git a/src/wx/wscript b/src/wx/wscript index 7679406e6..88987f1bf 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -1,5 +1,5 @@ # -# Copyright (C) 2012-2018 Carl Hetherington +# Copyright (C) 2012-2019 Carl Hetherington # # This file is part of DCP-o-matic. # @@ -33,9 +33,7 @@ sources = """ audio_plot.cc barco_alchemy_certificate_panel.cc batch_job_view.cc - subtitle_appearance_dialog.cc - text_panel.cc - text_view.cc + check_box.cc christie_certificate_panel.cc cinema_dialog.cc colour_conversion_editor.cc @@ -47,8 +45,11 @@ 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 @@ -66,12 +67,15 @@ 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 + 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 @@ -82,18 +86,24 @@ 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 + qube_certificate_panel.cc recreate_chain_dialog.cc repeat_dialog.cc report_problem_dialog.cc @@ -103,12 +113,21 @@ 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 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 @@ -132,12 +151,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 --gl-libs' % wx_libs, uselib_store='WXWIDGETS', mandatory=True) except: @@ -146,7 +168,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 --gl-libs' % wx_libs, uselib_store='WXWIDGETS', mandatory=True) except: @@ -154,7 +176,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 --gl-libs' % wx_libs, uselib_store='WXWIDGETS', mandatory=True) @@ -206,22 +228,32 @@ 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' + def build(bld): @@ -232,15 +264,18 @@ 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 GL GLU ' 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 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)