projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
wx
/
wscript
diff --git
a/src/wx/wscript
b/src/wx/wscript
index bb530989452cee3e6558a322f85cafb83197bde6..719496ae702a9d190aaea309a5d76e912ca8443a 100644
(file)
--- a/
src/wx/wscript
+++ b/
src/wx/wscript
@@
-15,13
+15,14
@@
sources = """
config_dialog.cc
content_colour_conversion_dialog.cc
content_menu.cc
config_dialog.cc
content_colour_conversion_dialog.cc
content_menu.cc
+ content_panel.cc
+ content_sub_panel.cc
isdcf_metadata_dialog.cc
dir_picker_ctrl.cc
dolby_certificate_dialog.cc
doremi_certificate_dialog.cc
download_certificate_dialog.cc
film_editor.cc
isdcf_metadata_dialog.cc
dir_picker_ctrl.cc
dolby_certificate_dialog.cc
doremi_certificate_dialog.cc
download_certificate_dialog.cc
film_editor.cc
- film_editor_panel.cc
film_viewer.cc
filter_dialog.cc
filter_editor.cc
film_viewer.cc
filter_dialog.cc
filter_editor.cc
@@
-68,6
+69,9
@@
def configure(conf):
conf.env.LIB_WXWIDGETS.append('Xxf86vm')
conf.env.LIB_WXWIDGETS.append('Xext')
conf.env.LIB_WXWIDGETS.append('X11')
conf.env.LIB_WXWIDGETS.append('Xxf86vm')
conf.env.LIB_WXWIDGETS.append('Xext')
conf.env.LIB_WXWIDGETS.append('X11')
+
+ 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()
conf.in_msg = 1
wx_version = conf.check_cfg(package='', path=conf.options.wx_config, args='--version').strip()