projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add server configuration back in.
[dcpomatic.git]
/
src
/
wx
/
wscript
diff --git
a/src/wx/wscript
b/src/wx/wscript
index 0ec4be0cd7b2212806c22793c4a8ab3e8e2b0678..c86188c6aded9c93ffe2c1ac68ce44a5227401a0 100644
(file)
--- a/
src/wx/wscript
+++ b/
src/wx/wscript
@@
-7,24
+7,37
@@
sources = """
about_dialog.cc
audio_dialog.cc
audio_mapping_view.cc
about_dialog.cc
audio_dialog.cc
audio_mapping_view.cc
+ audio_panel.cc
audio_plot.cc
audio_plot.cc
+ cinema_dialog.cc
+ colour_conversion_editor.cc
config_dialog.cc
config_dialog.cc
+ content_colour_conversion_dialog.cc
+ content_menu.cc
dci_metadata_dialog.cc
dir_picker_ctrl.cc
film_editor.cc
dci_metadata_dialog.cc
dir_picker_ctrl.cc
film_editor.cc
+ film_editor_panel.cc
film_viewer.cc
filter_dialog.cc
film_viewer.cc
filter_dialog.cc
- filter_
view
.cc
+ filter_
editor
.cc
gain_calculator_dialog.cc
gain_calculator_dialog.cc
- imagemagick_content_dialog.cc
job_manager_view.cc
job_wrapper.cc
job_manager_view.cc
job_wrapper.cc
+ kdm_dialog.cc
new_film_dialog.cc
new_film_dialog.cc
+ preset_colour_conversion_dialog.cc
properties_dialog.cc
properties_dialog.cc
+ repeat_dialog.cc
+ screen_dialog.cc
server_dialog.cc
server_dialog.cc
+ servers_list_dialog.cc
+ subtitle_panel.cc
timecode.cc
timeline.cc
timeline_dialog.cc
timecode.cc
timeline.cc
timeline_dialog.cc
+ timing_panel.cc
+ video_panel.cc
wx_util.cc
wx_ui_signaller.cc
"""
wx_util.cc
wx_ui_signaller.cc
"""
@@
-47,8
+60,8
@@
def configure(conf):
conf.in_msg = 1
wx_version = conf.check_cfg(package='', path=conf.options.wx_config, args='--version').strip()
conf.im_msg = 0
conf.in_msg = 1
wx_version = conf.check_cfg(package='', path=conf.options.wx_config, args='--version').strip()
conf.im_msg = 0
- if wx_version != '2.9.4':
- conf.fatal('wxwidgets version 2.9.4 is required; %s found' % wx_version)
+ if wx_version != '2.9.4'
and wx_version != '2.9.5'
:
+ conf.fatal('wxwidgets version 2.9.4
or 2.9.5
is required; %s found' % wx_version)
def build(bld):
if bld.env.STATIC:
def build(bld):
if bld.env.STATIC:
@@
-57,8
+70,7
@@
def build(bld):
obj = bld(features = 'cxx cxxshlib')
obj.name = 'libdcpomatic-wx'
obj = bld(features = 'cxx cxxshlib')
obj.name = 'libdcpomatic-wx'
- obj.includes = [ '..' ]
- obj.export_includes = ['.']
+ obj.export_includes = ['..']
obj.uselib = 'WXWIDGETS'
if bld.env.TARGET_LINUX:
obj.uselib += ' GTK'
obj.uselib = 'WXWIDGETS'
if bld.env.TARGET_LINUX:
obj.uselib += ' GTK'