diff options
Diffstat (limited to 'src/wx/wscript')
| -rw-r--r-- | src/wx/wscript | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/src/wx/wscript b/src/wx/wscript index 64a794c3b..13b0df292 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -49,12 +49,23 @@ sources = """ content_panel.cc content_properties_dialog.cc content_sub_panel.cc + content_timeline.cc + content_timeline_atmos_view.cc + content_timeline_audio_view.cc + content_timeline_dialog.cc + content_timeline_text_view.cc + content_timeline_video_view.cc + content_timeline_view.cc content_version_dialog.cc content_view.cc controls.cc credentials_download_certificate_panel.cc custom_scale_dialog.cc + dcp_referencing_dialog.cc dcp_panel.cc + dcp_timeline.cc + dcp_timeline_dialog.cc + dcp_timeline_reel_marker_view.cc dcp_text_track_dialog.cc dcpomatic_button.cc dcpomatic_choice.cc @@ -87,10 +98,8 @@ sources = """ gl_video_view.cc hints_dialog.cc html_dialog.cc - i18n_hook.cc image_sequence_dialog.cc invalid_certificate_period_dialog.cc - instant_i18n_dialog.cc interop_metadata_dialog.cc job_manager_view.cc job_view.cc @@ -103,6 +112,7 @@ sources = """ language_subtag_panel.cc language_tag_dialog.cc language_tag_widget.cc + load_config_from_zip_dialog.cc kdm_choice.cc make_chain_dialog.cc markers.cc @@ -160,27 +170,25 @@ sources = """ timer_display.cc timecode.cc timeline.cc - timeline_atmos_content_view.cc timeline_content_view.cc - timeline_dialog.cc - timeline_audio_content_view.cc timeline_labels_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 + verify_dcp_result_dialog.cc + verify_dcp_result_panel.cc verify_dcp_progress_dialog.cc + verify_dcp_progress_panel.cc video_panel.cc video_view.cc video_waveform_dialog.cc video_waveform_plot.cc - wx_util.cc + window_metrics.cc wx_signal_manager.cc + wx_util.cc + wx_variant.cc """ def configure(conf): @@ -226,7 +234,7 @@ def configure(conf): 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']) - conf.env.append_value('CXXFLAGS', ['-DwxNO_UNSAFE_WXSTRING_CONV']) + conf.env.append_value('CXXFLAGS', ['-DwxNO_UNSAFE_WXSTRING_CONV', '-DwxNO_IMPLICIT_WXSTRING_ENCODING']) if conf.options.static_wxwidgets: # wx-config returns its static libraries as full paths, without -l prefixes, which confuses |
