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 a0a4bbe8b27e85f3d9d166143e1bbd26ba1b2641..992f31175eb0e27cfb36ed1209f7c411d53567a8 100644
(file)
--- a/
src/wx/wscript
+++ b/
src/wx/wscript
@@
-4,6
+4,10
@@
from waflib import Logs
import i18n
sources = """
import i18n
sources = """
+ about_dialog.cc
+ audio_dialog.cc
+ audio_mapping_view.cc
+ audio_plot.cc
config_dialog.cc
dci_metadata_dialog.cc
dir_picker_ctrl.cc
config_dialog.cc
dci_metadata_dialog.cc
dir_picker_ctrl.cc
@@
-12,11
+16,15
@@
sources = """
filter_dialog.cc
filter_view.cc
gain_calculator_dialog.cc
filter_dialog.cc
filter_view.cc
gain_calculator_dialog.cc
+ imagemagick_content_dialog.cc
job_manager_view.cc
job_wrapper.cc
new_film_dialog.cc
properties_dialog.cc
server_dialog.cc
job_manager_view.cc
job_wrapper.cc
new_film_dialog.cc
properties_dialog.cc
server_dialog.cc
+ timecode.cc
+ timeline.cc
+ timeline_dialog.cc
wx_util.cc
wx_ui_signaller.cc
"""
wx_util.cc
wx_ui_signaller.cc
"""
@@
-30,17
+38,18
@@
def build(bld):
else:
obj = bld(features = 'cxx cxxshlib')
else:
obj = bld(features = 'cxx cxxshlib')
- obj.name = 'libd
vd
omatic-wx'
+ obj.name = 'libd
cp
omatic-wx'
obj.includes = [ '..' ]
obj.export_includes = ['.']
obj.uselib = 'WXWIDGETS'
obj.includes = [ '..' ]
obj.export_includes = ['.']
obj.uselib = 'WXWIDGETS'
- obj.use = 'libd
vd
omatic'
+ obj.use = 'libd
cp
omatic'
obj.source = sources
obj.source = sources
- obj.target = 'd
vd
omatic-wx'
+ obj.target = 'd
cp
omatic-wx'
-def pot(bld):
- i18n.pot(os.path.join('src', 'wx'), sources, 'libdvdomatic-wx')
+ i18n.po_to_mo(os.path.join('src', 'wx'), 'libdcpomatic-wx', bld)
-def
mo
(bld):
- i18n.po
_to_mo(os.path.join('src', 'wx'), 'libdvd
omatic-wx')
+def
pot
(bld):
+ i18n.po
t(os.path.join('src', 'wx'), sources, 'libdcp
omatic-wx')
+def pot_merge(bld):
+ i18n.pot_merge(os.path.join('src', 'wx'), 'libdcpomatic-wx')