projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Separate Controls into standard/swaroop.
[dcpomatic.git]
/
src
/
wx
/
wscript
diff --git
a/src/wx/wscript
b/src/wx/wscript
index 9400b63e29c6976378207751df5823eb4348b25b..bec58a3532cb28a014dd7071a40c7d9822bf1899 100644
(file)
--- a/
src/wx/wscript
+++ b/
src/wx/wscript
@@
-47,11
+47,14
@@
sources = """
content_panel.cc
content_properties_dialog.cc
content_sub_panel.cc
content_panel.cc
content_properties_dialog.cc
content_sub_panel.cc
+ content_view.cc
+ controls.cc
closed_captions_dialog.cc
dcp_panel.cc
email_dialog.cc
image_sequence_dialog.cc
isdcf_metadata_dialog.cc
closed_captions_dialog.cc
dcp_panel.cc
email_dialog.cc
image_sequence_dialog.cc
isdcf_metadata_dialog.cc
+ dcp_text_track_dialog.cc
dir_picker_ctrl.cc
dolby_doremi_certificate_panel.cc
download_certificate_dialog.cc
dir_picker_ctrl.cc
dolby_doremi_certificate_panel.cc
download_certificate_dialog.cc
@@
-70,6
+73,7
@@
sources = """
gain_calculator_dialog.cc
gdc_certificate_panel.cc
hints_dialog.cc
gain_calculator_dialog.cc
gdc_certificate_panel.cc
hints_dialog.cc
+ initial_setup_dialog.cc
job_view.cc
job_view_dialog.cc
job_manager_view.cc
job_view.cc
job_view_dialog.cc
job_manager_view.cc
@@
-81,6
+85,7
@@
sources = """
key_dialog.cc
make_chain_dialog.cc
message_dialog.cc
key_dialog.cc
make_chain_dialog.cc
message_dialog.cc
+ monitor_dialog.cc
move_to_dialog.cc
nag_dialog.cc
name_format_editor.cc
move_to_dialog.cc
nag_dialog.cc
name_format_editor.cc
@@
-103,6
+108,8
@@
sources = """
self_dkdm_dialog.cc
server_dialog.cc
servers_list_dialog.cc
self_dkdm_dialog.cc
server_dialog.cc
servers_list_dialog.cc
+ standard_controls.cc
+ swaroop_controls.cc
system_font_dialog.cc
table_dialog.cc
templates_dialog.cc
system_font_dialog.cc
table_dialog.cc
templates_dialog.cc
@@
-176,7
+183,7
@@
def configure(conf):
conf.env.STLIBPATH_WXWIDGETS = stlib_paths
conf.in_msg = 1
conf.env.STLIBPATH_WXWIDGETS = stlib_paths
conf.in_msg = 1
- wx_version = conf.check_cfg(package='', path=wx_config, args='--version').strip()
+ wx_version = conf.check_cfg(package='
wxwidgets
', 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)
conf.im_msg = 0
if not wx_version.startswith('3.0.'):
conf.fatal('wxwidgets version 3.0.x is required; %s found' % wx_version)
@@
-214,8
+221,7
@@
def configure(conf):
int main() { throw RtError("Hello"); }
""",
msg='Checking for RtError class',
int main() { throw RtError("Hello"); }
""",
msg='Checking for RtError class',
- libpath='/usr/local/lib',
- lib=['rtaudio'],
+ use='RTAUDIO',
uselib_store='',
define_name='DCPOMATIC_USE_RTERROR',
mandatory=False)
uselib_store='',
define_name='DCPOMATIC_USE_RTERROR',
mandatory=False)