X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fwscript;h=83e2022b3bb9728a61f2c2f48edeef71d7d7a303;hp=183466106db5647e805752491f4a585d8a3157b8;hb=9e67ff28e3ccd3a3e51e62f400455c7046f8b6bd;hpb=f77ec143719c86ddbf098bff6d19fe2a159b8c3e diff --git a/src/wx/wscript b/src/wx/wscript index 183466106..83e2022b3 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. # @@ -40,6 +40,7 @@ sources = """ 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 @@ -48,13 +49,19 @@ sources = """ 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 @@ -70,7 +77,9 @@ sources = """ 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 @@ -84,7 +93,9 @@ 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 @@ -92,11 +103,19 @@ sources = """ 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 @@ -109,15 +128,19 @@ sources = """ 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 + 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 @@ -131,9 +154,11 @@ sources = """ 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 @@ -142,14 +167,14 @@ 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', package='', path=wx_config, - args='--cppflags --cxxflags --libs %s' % wx_libs, + args='--cppflags --cxxflags --libs %s --gl-libs' % wx_libs, uselib_store='WXWIDGETS', mandatory=True) except: @@ -158,7 +183,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 %s' % wx_libs, + args='--cppflags --cxxflags --libs %s --gl-libs' % wx_libs, uselib_store='WXWIDGETS', mandatory=True) except: @@ -166,12 +191,17 @@ def configure(conf): conf.check_cfg(msg='Checking for wxWidgets using wx-config', package='', path=wx_config, - args='--cppflags --cxxflags --libs %s' % wx_libs, + 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 = [] @@ -218,10 +248,14 @@ 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 @@ -233,6 +267,29 @@ def configure(conf): 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): @@ -245,13 +302,13 @@ 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' - if bld.env.VARIANT == 'swaroop': + if not len(bld.env.VARIANT) == 0 and bld.env.VARIANT.startswith('swaroop-'): obj.source = sources + " swaroop_controls.cc" else: obj.source = sources