X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fwscript;h=3657f5287520ce274b9ba4c48cfae4e8db90225d;hb=f29f405000752ad568de1e304640a4edac8214bc;hp=a04df2d41751a718f72f3f30584cf2109c94a1ee;hpb=41b7a04cf3dedaa93aaf3c050db7a693281417f7;p=dcpomatic.git diff --git a/src/wx/wscript b/src/wx/wscript index a04df2d41..3657f5287 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -1,4 +1,24 @@ +# +# Copyright (C) 2012-2015 Carl Hetherington +# +# This program 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. +# +# This program 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 this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# + import os +import subprocess +import shlex import glob from waflib import Logs import i18n @@ -15,77 +35,123 @@ sources = """ config_dialog.cc content_colour_conversion_dialog.cc content_menu.cc - dci_metadata_dialog.cc + content_panel.cc + content_properties_dialog.cc + content_sub_panel.cc + dcp_panel.cc + image_sequence_dialog.cc + isdcf_metadata_dialog.cc dir_picker_ctrl.cc dolby_certificate_dialog.cc doremi_certificate_dialog.cc download_certificate_dialog.cc + file_picker_ctrl.cc film_editor.cc - film_editor_panel.cc film_viewer.cc filter_dialog.cc filter_editor.cc + fonts_dialog.cc gain_calculator_dialog.cc hints_dialog.cc + job_view.cc + job_view_dialog.cc job_manager_view.cc - job_wrapper.cc kdm_dialog.cc + kdm_output_panel.cc + kdm_timing_panel.cc + key_dialog.cc + make_chain_dialog.cc new_film_dialog.cc preset_colour_conversion_dialog.cc - properties_dialog.cc repeat_dialog.cc + report_problem_dialog.cc screen_dialog.cc + screens_panel.cc server_dialog.cc servers_list_dialog.cc subtitle_panel.cc + subtitle_view.cc + system_font_dialog.cc table_dialog.cc timecode.cc timeline.cc + timeline_content_view.cc timeline_dialog.cc + timeline_audio_content_view.cc + timeline_subtitle_content_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', + 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', + 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'] - + # 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 + 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 wx_version != '3.0.0': - conf.fatal('wxwidgets version 3.0.0 is required; %s found' % wx_version) + 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 = 'libdcpomatic-wx' + 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.use = 'libdcpomatic' + obj.uselib += 'GTK ' + if bld.env.TARGET_WINDOWS: + obj.uselib += 'WINSOCK2 ' + obj.use = 'libdcpomatic2' obj.source = sources - obj.target = 'dcpomatic-wx' + obj.target = 'dcpomatic2-wx' - i18n.po_to_mo(os.path.join('src', 'wx'), 'libdcpomatic-wx', 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')