dkdm_output_panel.cc
drive_wipe_warning_dialog.cc
email_dialog.cc
+ full_language_tag_dialog.cc
image_sequence_dialog.cc
isdcf_metadata_dialog.cc
dcp_text_track_dialog.cc
gl_video_view.cc
hints_dialog.cc
html_dialog.cc
- initial_setup_dialog.cc
instant_i18n_dialog.cc
interop_metadata_dialog.cc
i18n_hook.cc
kdm_output_panel.cc
kdm_timing_panel.cc
language_tag_dialog.cc
+ language_tag_widget.cc
make_chain_dialog.cc
markers_dialog.cc
message_dialog.cc
try_unmount_dialog.cc
update_dialog.cc
verify_dcp_dialog.cc
+ verify_dcp_progress_dialog.cc
video_panel.cc
video_view.cc
video_waveform_dialog.cc
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',
+ if conf.options.wx_config is not None:
+ wx_config = conf.options.wx_config
+ conf.check_cfg(msg='Checking for wxWidgets using %s' % wx_config,
package='',
path=wx_config,
args='--cppflags --cxxflags --libs %s --gl-libs' % wx_libs,
uselib_store='WXWIDGETS',
mandatory=True)
- except:
+ else:
try:
- wx_config = 'wx-config-3.0-gtk2'
- conf.check_cfg(msg='Checking for wxWidgets using wx-config-3.0-gtk2',
+ 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 --gl-libs' % wx_libs,
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 %s --gl-libs' % wx_libs,
- 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 %s --gl-libs' % wx_libs,
+ 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 %s --gl-libs' % wx_libs,
+ uselib_store='WXWIDGETS',
+ mandatory=True)
if conf.env.TARGET_LINUX:
conf.env.append_value('CXXFLAGS', ['-DGLX_GLXEXT_PROTOTYPES'])
if bld.env.TARGET_OSX:
obj.framework = ['CoreAudio', 'OpenGL']
obj.use = 'libdcpomatic2'
- if not len(bld.env.VARIANT) == 0 and bld.env.VARIANT.startswith('swaroop-'):
- obj.source = sources + " swaroop_controls.cc"
- else:
- obj.source = sources
+ obj.source = sources
obj.target = 'dcpomatic2-wx'
i18n.po_to_mo(os.path.join('src', 'wx'), 'libdcpomatic2-wx', bld)