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 466f2903191b203196dd2fe7cc355427841be77e..c7ab4460401ef99656ddacdbd11edcd2576038db 100644
(file)
--- a/
src/tools/wscript
+++ b/
src/tools/wscript
@@
-6,21
+6,23
@@
import i18n
def build(bld):
for t in ['dcpomatic_cli', 'dcpomatic_server_cli']:
obj = bld(features = 'cxx cxxprogram')
def build(bld):
for t in ['dcpomatic_cli', 'dcpomatic_server_cli']:
obj = bld(features = 'cxx cxxprogram')
- obj.uselib = 'BOOST_THREAD OPENJPEG DCP CXML AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC'
+ obj.uselib = 'BOOST_THREAD OPENJPEG DCP CXML AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC
WXWIDGETS
'
obj.includes = ['..']
obj.use = ['libdcpomatic']
obj.source = '%s.cc' % t
obj.target = t
if not bld.env.DISABLE_GUI:
obj.includes = ['..']
obj.use = ['libdcpomatic']
obj.source = '%s.cc' % t
obj.target = t
if not bld.env.DISABLE_GUI:
- for t in ['dcpomatic', 'dcpomatic_server']:
+ for t in ['dcpomatic', 'dcpomatic_
batch', 'dcpomatic_
server']:
obj = bld(features = 'cxx cxxprogram')
obj = bld(features = 'cxx cxxprogram')
- obj.uselib = 'DCP CXML OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC'
+ obj.uselib = 'DCP OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML WXWIDGETS'
+ if bld.env.STATIC:
+ obj.uselib += ' GTK'
obj.includes = ['..']
obj.use = ['libdcpomatic', 'libdcpomatic-wx']
obj.source = '%s.cc' % t
if bld.env.TARGET_WINDOWS:
obj.includes = ['..']
obj.use = ['libdcpomatic', 'libdcpomatic-wx']
obj.source = '%s.cc' % t
if bld.env.TARGET_WINDOWS:
- obj.source += ' ../../windows/dcpomatic.rc'
+ obj.source += ' ../../
platform/
windows/dcpomatic.rc'
obj.target = t
i18n.po_to_mo(os.path.join('src', 'tools'), 'dcpomatic', bld)
obj.target = t
i18n.po_to_mo(os.path.join('src', 'tools'), 'dcpomatic', bld)