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
/
lib
/
wscript
diff --git
a/src/lib/wscript
b/src/lib/wscript
index 32a2cde238d0f0c0bc81a24a89fb86e6eec7f224..e53ac5a840d705381fafa16955a592f9cc68ff1a 100644
(file)
--- a/
src/lib/wscript
+++ b/
src/lib/wscript
@@
-8,6
+8,7
@@
sources = """
audio_analysis.cc
audio_content.cc
audio_decoder.cc
audio_analysis.cc
audio_content.cc
audio_decoder.cc
+ audio_mapping.cc
audio_source.cc
config.cc
combiner.cc
audio_source.cc
config.cc
combiner.cc
@@
-51,9
+52,9
@@
sources = """
transcode_job.cc
transcoder.cc
types.cc
transcode_job.cc
transcoder.cc
types.cc
+ trimmer.cc
ui_signaller.cc
util.cc
ui_signaller.cc
util.cc
- version.cc
video_content.cc
video_decoder.cc
video_source.cc
video_content.cc
video_decoder.cc
video_source.cc
@@
-66,7
+67,7
@@
def build(bld):
else:
obj = bld(features = 'cxx cxxshlib')
else:
obj = bld(features = 'cxx cxxshlib')
- obj.name = 'libd
vd
omatic'
+ obj.name = 'libd
cp
omatic'
obj.export_includes = ['.']
obj.uselib = """
AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE
obj.export_includes = ['.']
obj.uselib = """
AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE
@@
-75,13
+76,15
@@
def build(bld):
"""
if bld.env.TARGET_WINDOWS:
obj.uselib += ' WINSOCK2'
"""
if bld.env.TARGET_WINDOWS:
obj.uselib += ' WINSOCK2'
- obj.source = sources
- obj.target = 'dvdomatic'
+ if bld.env.STATIC:
+ obj.uselib += ' XML++'
+ obj.source = sources + " version.cc"
+ obj.target = 'dcpomatic'
- i18n.po_to_mo(os.path.join('src', 'lib'), 'libd
vd
omatic', bld)
+ i18n.po_to_mo(os.path.join('src', 'lib'), 'libd
cp
omatic', bld)
def pot(bld):
def pot(bld):
- i18n.pot(os.path.join('src', 'lib'), sources, 'libd
vd
omatic')
+ i18n.pot(os.path.join('src', 'lib'), sources, 'libd
cp
omatic')
def pot_merge(bld):
def pot_merge(bld):
- i18n.pot_merge(os.path.join('src', 'lib'), 'libd
vd
omatic')
+ i18n.pot_merge(os.path.join('src', 'lib'), 'libd
cp
omatic')