projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move subtitle export to its own dialogue.
[dcpomatic.git]
/
src
/
wx
/
wscript
diff --git
a/src/wx/wscript
b/src/wx/wscript
index 6a9003ef1776d4ddf73588d85d6b871c7f14718a..5d8fc16bb7b060cc89ddb383aa022756067a247b 100644
(file)
--- a/
src/wx/wscript
+++ b/
src/wx/wscript
@@
-40,6
+40,7
@@
sources = """
config_dialog.cc
config_move_dialog.cc
confirm_kdm_email_dialog.cc
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
content_colour_conversion_dialog.cc
content_menu.cc
content_panel.cc
@@
-49,24
+50,28
@@
sources = """
controls.cc
closed_captions_dialog.cc
credentials_download_certificate_panel.cc
controls.cc
closed_captions_dialog.cc
credentials_download_certificate_panel.cc
+ custom_scale_dialog.cc
dcp_panel.cc
dcpomatic_button.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
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
export_dialog.cc
dolby_doremi_certificate_panel.cc
download_certificate_dialog.cc
download_certificate_panel.cc
export_dialog.cc
+ export_subtitles_dialog.cc
file_picker_ctrl.cc
film_editor.cc
film_name_location_dialog.cc
film_viewer.cc
filter_dialog.cc
file_picker_ctrl.cc
film_editor.cc
film_name_location_dialog.cc
film_viewer.cc
filter_dialog.cc
- filter_editor.cc
focus_manager.cc
fonts_dialog.cc
full_config_dialog.cc
focus_manager.cc
fonts_dialog.cc
full_config_dialog.cc
@@
-86,7
+91,6
@@
sources = """
kdm_dialog.cc
kdm_output_panel.cc
kdm_timing_panel.cc
kdm_dialog.cc
kdm_output_panel.cc
kdm_timing_panel.cc
- key_dialog.cc
make_chain_dialog.cc
markers_dialog.cc
message_dialog.cc
make_chain_dialog.cc
markers_dialog.cc
message_dialog.cc
@@
-109,6
+113,8
@@
sources = """
question_dialog.cc
rating_dialog.cc
qube_certificate_panel.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
recreate_chain_dialog.cc
repeat_dialog.cc
report_problem_dialog.cc
@@
-160,7
+166,7
@@
sources = """
def configure(conf):
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'
try:
wx_config = '/usr/lib64/wx/config/gtk2-unicode-3.0'
@@
-194,7
+200,7
@@
def configure(conf):
conf.env.append_value('CXXFLAGS', ['-DWGL_WGLEXT_PROTOTYPES'])
if conf.options.static_wxwidgets:
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 = []
# check_cfg(). It puts the static libraries into LINKFLAGS_WXWIDGETS, so fish them out.
stlibs = []
new_linkflags = []
@@
-214,10
+220,14
@@
def configure(conf):
conf.in_msg = 1
wx_version = conf.check_cfg(package='wxwidgets', path=wx_config, args='--version').strip()
conf.in_msg = 1
wx_version = conf.check_cfg(package='wxwidgets', path=wx_config, args='--version').strip()
- conf.i
m
_msg = 0
+ conf.i
n
_msg = 0
if not wx_version.startswith('3.0.'):
conf.fatal('wxwidgets version 3.0.x 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)
+ config = conf.check_cfg(package='wxwidgets', path=wx_config, args='--selected-config').strip()
+ if config.find('gtk2') != -1:
+ conf.check_cfg(package='gtk+-2.0', args='--cflags --libs', uselib_store='GTK', mandatory=True)
+
try:
conf.check_cfg(msg='Checking for RtAudio using pkg-config',
package='rtaudio',
try:
conf.check_cfg(msg='Checking for RtAudio using pkg-config',
package='rtaudio',