X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fwscript;h=4543be09f9e318600937673901907bc3913d7d05;hb=00b60f52add041a36fa62118baf4b5ac78993980;hp=0f39038a5f4873eccac693933faedee72eaeec3c;hpb=b56bc3c45953fe113a9934b0d2ec2c1134de07ab;p=dcpomatic.git diff --git a/src/wx/wscript b/src/wx/wscript index 0f39038a5..4543be09f 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -1,4 +1,25 @@ +# +# Copyright (C) 2012-2015 Carl Hetherington +# +# This file is part of DCP-o-matic. +# +# DCP-o-matic is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# DCP-o-matic is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with DCP-o-matic. If not, see . +# + import os +import subprocess +import shlex import glob from waflib import Logs import i18n @@ -10,88 +31,143 @@ sources = """ audio_mapping_view.cc audio_panel.cc audio_plot.cc + batch_job_view.cc cinema_dialog.cc colour_conversion_editor.cc config_dialog.cc + confirm_kdm_email_dialog.cc content_colour_conversion_dialog.cc content_menu.cc content_panel.cc + content_properties_dialog.cc content_sub_panel.cc dcp_panel.cc + email_dialog.cc + image_sequence_dialog.cc + image_subtitle_colour_dialog.cc isdcf_metadata_dialog.cc dir_picker_ctrl.cc - dolby_certificate_dialog.cc - doremi_certificate_dialog.cc + dolby_doremi_certificate_panel.cc download_certificate_dialog.cc + download_certificate_panel.cc + file_picker_ctrl.cc film_editor.cc film_viewer.cc filter_dialog.cc filter_editor.cc + fonts_dialog.cc + font_files_dialog.cc gain_calculator_dialog.cc hints_dialog.cc + job_view.cc + job_view_dialog.cc job_manager_view.cc - job_wrapper.cc + kdm_cpl_panel.cc kdm_dialog.cc - make_signer_chain_dialog.cc + kdm_output_panel.cc + kdm_timing_panel.cc + key_dialog.cc + make_chain_dialog.cc + move_to_dialog.cc + name_format_editor.cc new_film_dialog.cc - preset_colour_conversion_dialog.cc - properties_dialog.cc + normal_job_view.cc + playhead_to_timecode_dialog.cc + playhead_to_frame_dialog.cc repeat_dialog.cc + report_problem_dialog.cc + rename_template_dialog.cc + rgba_colour_picker.cc + save_template_dialog.cc screen_dialog.cc + screens_panel.cc + self_dkdm_dialog.cc server_dialog.cc servers_list_dialog.cc subtitle_panel.cc subtitle_view.cc + system_font_dialog.cc table_dialog.cc + templates_dialog.cc + text_subtitle_appearance_dialog.cc + time_picker.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_subtitle_content_view.cc + timeline_reels_view.cc + timeline_time_axis_view.cc + timeline_video_content_view.cc + timeline_view.cc timing_panel.cc update_dialog.cc video_panel.cc + video_waveform_dialog.cc + video_waveform_plot.cc wx_util.cc - wx_ui_signaller.cc + wx_signal_manager.cc """ def configure(conf): - args = '--cppflags --cxxflags' - if not conf.env.BUILD_STATIC: - args += ' --libs std,richtext' - - conf.check_cfg(msg='Checking for wxWidgets', package='', path=conf.options.wx_config, args=args, - 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 std,richtext', + 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) - if conf.env.BUILD_STATIC: + if conf.options.static_wxwidgets: # wx-config returns its static libraries as full paths, without -l prefixes, which confuses - # check_cfg(), so just hard-code it all. - conf.env.STLIB_WXWIDGETS = ['wx_gtk2u_richtext-3.0', 'wx_gtk2u_xrc-3.0', 'wx_gtk2u_qa-3.0', 'wx_baseu_net-3.0', 'wx_gtk2u_html-3.0', - 'wx_gtk2u_adv-3.0', 'wx_gtk2u_core-3.0', 'wx_baseu_xml-3.0', 'wx_baseu-3.0'] - conf.env.LIB_WXWIDGETS = ['tiff', 'SM', 'dl', 'jpeg', 'png', 'X11', 'expat'] - if conf.env.TARGET_DEBIAN and conf.env.DEBIAN_UNSTABLE: - conf.env.LIB_WXWIDGETS.append('Xxf86vm') - conf.env.LIB_WXWIDGETS.append('Xext') - conf.env.LIB_WXWIDGETS.append('X11') + # check_cfg(). It puts the static libraries into LINKFLAGS_WXWIDGETS, so fish them out. + stlibs = [] + new_linkflags = [] + stlib_paths = [] + for f in conf.env.LINKFLAGS_WXWIDGETS: + if f.startswith('/'): + d = os.path.dirname(f) + if not d in stlib_paths: + stlib_paths.append(d) + stlibs.append(os.path.basename(f)[3:-2]) + else: + new_linkflags.append(f) + + conf.env.STLIB_WXWIDGETS = stlibs + conf.env.LINKFLAGS_WXWIDGETS = new_linkflags + conf.env.STLIBPATH_WXWIDGETS = stlib_paths - if conf.env.TARGET_CENTOS_7: - conf.env.LIB_WXWIDGETS.append('Xxf86vm') - conf.in_msg = 1 - wx_version = conf.check_cfg(package='', path=conf.options.wx_config, args='--version').strip() + wx_version = conf.check_cfg(package='', 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) def build(bld): - if bld.env.BUILD_STATIC: + if bld.env.STATIC_DCPOMATIC: obj = bld(features = 'cxx cxxstlib') else: obj = bld(features = 'cxx cxxshlib') obj.name = 'libdcpomatic2-wx' obj.export_includes = ['..'] - obj.uselib = 'WXWIDGETS DCP' + obj.uselib = 'BOOST_FILESYSTEM BOOST_THREAD BOOST_REGEX WXWIDGETS DCP SUB ZIP ' if bld.env.TARGET_LINUX: - obj.uselib += ' GTK' + obj.uselib += 'GTK ' + if bld.env.TARGET_WINDOWS: + obj.uselib += 'WINSOCK2 ' obj.use = 'libdcpomatic2' obj.source = sources obj.target = 'dcpomatic2-wx' @@ -99,7 +175,7 @@ def build(bld): i18n.po_to_mo(os.path.join('src', 'wx'), 'libdcpomatic2-wx', bld) def pot(bld): - i18n.pot(os.path.join('src', 'wx'), sources + " editable_list.h", 'libdcpomatic-wx') + i18n.pot(os.path.join('src', 'wx'), sources + " editable_list.h content_widget.h", 'libdcpomatic-wx') def pot_merge(bld): i18n.pot_merge(os.path.join('src', 'wx'), 'libdcpomatic-wx')