summaryrefslogtreecommitdiff
path: root/src/lib/wscript
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-04-15 15:00:35 +0100
committerCarl Hetherington <cth@carlh.net>2013-04-15 15:00:35 +0100
commita00ebbc68438e84076c65e99d0e70403afb4407d (patch)
tree6ee2f535eeb6b592c740e117d1f8f8657d6bcce8 /src/lib/wscript
parent665bc942f86bd7a8aeb2b38f3e9c2cb6662e6edc (diff)
parent606b3f759238aa6c0d12de064b301bf36b428220 (diff)
Merge master.
Diffstat (limited to 'src/lib/wscript')
-rw-r--r--src/lib/wscript9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/lib/wscript b/src/lib/wscript
index d36a24e7a..8e9d34706 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -20,7 +20,7 @@ sources = """
dolby_cp750.cc
encoder.cc
examine_content_job.cc
- external_audio_decoder.cc
+ exceptions.cc
filter_graph.cc
ffmpeg_compatibility.cc
ffmpeg_decoder.cc
@@ -38,6 +38,7 @@ sources = """
scp_dcp_job.cc
scaler.cc
server.cc
+ sndfile_decoder.cc
sound_processor.cc
stream.cc
subtitle.cc
@@ -46,7 +47,6 @@ sources = """
transcoder.cc
ui_signaller.cc
util.cc
- version.cc
video_decoder.cc
video_source.cc
writer.cc
@@ -67,10 +67,13 @@ def build(bld):
"""
if bld.env.TARGET_WINDOWS:
obj.uselib += ' WINSOCK2'
- obj.source = sources
+ obj.source = sources + " version.cc"
obj.target = 'dvdomatic'
i18n.po_to_mo(os.path.join('src', 'lib'), 'libdvdomatic', bld)
def pot(bld):
i18n.pot(os.path.join('src', 'lib'), sources, 'libdvdomatic')
+
+def pot_merge(bld):
+ i18n.pot_merge(os.path.join('src', 'lib'), 'libdvdomatic')