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
/
tools
/
wscript
diff --git
a/src/tools/wscript
b/src/tools/wscript
index 20a92cad2f4adb38df59f88394426b4f0306853b..c7ab4460401ef99656ddacdbd11edcd2576038db 100644
(file)
--- a/
src/tools/wscript
+++ b/
src/tools/wscript
@@
-4,31
+4,31
@@
from waflib import Logs
import i18n
def build(bld):
import i18n
def build(bld):
- for t in ['
makedcp', 'servomatic_cli', 'servomatictest
']:
+ for t in ['
dcpomatic_cli', 'dcpomatic_server_cli
']:
obj = bld(features = 'cxx cxxprogram')
obj = bld(features = 'cxx cxxprogram')
- obj.uselib = 'BOOST_THREAD OPENJPEG DCP
AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML
WXWIDGETS'
+ obj.uselib = 'BOOST_THREAD OPENJPEG DCP
CXML AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC
WXWIDGETS'
obj.includes = ['..']
obj.includes = ['..']
- obj.use = ['libd
vd
omatic']
+ obj.use = ['libd
cp
omatic']
obj.source = '%s.cc' % t
obj.target = t
if not bld.env.DISABLE_GUI:
obj.source = '%s.cc' % t
obj.target = t
if not bld.env.DISABLE_GUI:
- for t in ['d
vdomatic', 'dvdomatic_batch', 'servomatic_gui
']:
+ for t in ['d
cpomatic', 'dcpomatic_batch', 'dcpomatic_server
']:
obj = bld(features = 'cxx cxxprogram')
obj.uselib = 'DCP OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML WXWIDGETS'
if bld.env.STATIC:
obj.uselib += ' GTK'
obj.includes = ['..']
obj = bld(features = 'cxx cxxprogram')
obj.uselib = 'DCP OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML WXWIDGETS'
if bld.env.STATIC:
obj.uselib += ' GTK'
obj.includes = ['..']
- obj.use = ['libd
vdomatic', 'libdvd
omatic-wx']
+ obj.use = ['libd
cpomatic', 'libdcp
omatic-wx']
obj.source = '%s.cc' % t
if bld.env.TARGET_WINDOWS:
obj.source = '%s.cc' % t
if bld.env.TARGET_WINDOWS:
- obj.source += ' ../../platform/windows/d
vd
omatic.rc'
+ obj.source += ' ../../platform/windows/d
cp
omatic.rc'
obj.target = t
obj.target = t
- i18n.po_to_mo(os.path.join('src', 'tools'), 'd
vd
omatic', bld)
+ i18n.po_to_mo(os.path.join('src', 'tools'), 'd
cp
omatic', bld)
def pot(bld):
def pot(bld):
- i18n.pot(os.path.join('src', 'tools'), 'd
vdomatic.cc', 'dvd
omatic')
+ i18n.pot(os.path.join('src', 'tools'), 'd
cpomatic.cc', 'dcp
omatic')
def pot_merge(bld):
def pot_merge(bld):
- i18n.pot_merge(os.path.join('src', 'tools'), 'd
vd
omatic')
+ i18n.pot_merge(os.path.join('src', 'tools'), 'd
cp
omatic')