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 f0ffb8e8994aafd60f1018d8db94d367b25cd5e3..34d8be059ea75466710e7aa976b24c31faf2e438 100644
(file)
--- a/
src/tools/wscript
+++ b/
src/tools/wscript
@@
-3,30
+3,39
@@
import glob
from waflib import Logs
import i18n
from waflib import Logs
import i18n
+def configure(conf):
+ if conf.env.TARGET_WINDOWS:
+ conf.env.append_value('CXXFLAGS', ['-mconsole'])
+ conf.env.append_value('LINKFLAGS', ['-mconsole'])
+
def build(bld):
def build(bld):
- for t in ['
makedcp', 'servomatic_cli', 'servomatictest
']:
+ for t in ['
dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm', 'dcpomatic_create
']:
obj = bld(features = 'cxx cxxprogram')
obj = bld(features = 'cxx cxxprogram')
- obj.uselib = 'BOOST_THREAD
OPENJPEG DCP CXML AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC
'
+ obj.uselib = 'BOOST_THREAD
BOOST_DATETIME OPENJPEG DCP CXML AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC WXWIDGETS QUICKMAIL
'
obj.includes = ['..']
obj.includes = ['..']
- obj.use = ['libdcpomatic']
+ obj.use = ['libdcpomatic
2
']
obj.source = '%s.cc' % t
obj.source = '%s.cc' % t
- obj.target = t
+ obj.target = t.replace('dcpomatic', 'dcpomatic2')
+ if t == 'server_test':
+ obj.install_path = None
if not bld.env.DISABLE_GUI:
if not bld.env.DISABLE_GUI:
- for t in ['dcpomatic', '
servomatic_gui
']:
+ 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 = 'BOOST_THREAD BOOST_DATETIME OPENJPEG DCP CXML AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML WXWIDGETS QUICKMAIL'
+ if bld.env.BUILD_STATIC:
+ obj.uselib += ' GTK'
obj.includes = ['..']
obj.includes = ['..']
- obj.use = ['libdcpomatic
', 'libdcpomatic
-wx']
+ obj.use = ['libdcpomatic
2', 'libdcpomatic2
-wx']
obj.source = '%s.cc' % t
if bld.env.TARGET_WINDOWS:
obj.source = '%s.cc' % t
if bld.env.TARGET_WINDOWS:
- obj.source += ' ../../windows/dcpomatic.rc'
- obj.target = t
+ obj.source += ' ../../
platform/
windows/dcpomatic.rc'
+ obj.target = t
.replace('dcpomatic', 'dcpomatic2')
- i18n.po_to_mo(os.path.join('src', 'tools'), 'dcpomatic', bld)
+ i18n.po_to_mo(os.path.join('src', 'tools'), 'dcpomatic
2
', bld)
def pot(bld):
def pot(bld):
- i18n.pot(os.path.join('src', 'tools'), 'dcpomatic.cc', 'dcpomatic')
+ i18n.pot(os.path.join('src', 'tools'), 'dcpomatic.cc
dcpomatic_batch.cc
', 'dcpomatic')
def pot_merge(bld):
i18n.pot_merge(os.path.join('src', 'tools'), 'dcpomatic')
def pot_merge(bld):
i18n.pot_merge(os.path.join('src', 'tools'), 'dcpomatic')