projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Missing link of curl for centos-6.5.
[dcpomatic.git]
/
src
/
tools
/
wscript
diff --git
a/src/tools/wscript
b/src/tools/wscript
index 42fc90adbeac9e073f7ab101fcd5eef6c40141dd..ecbefe4c6c5afbce6da51782673481117166b512 100644
(file)
--- a/
src/tools/wscript
+++ b/
src/tools/wscript
@@
-3,32
+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 ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test']:
+ 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 WXWIDGETS
'
+ obj.uselib = 'BOOST_THREAD
BOOST_DATETIME OPENJPEG DCP CXML AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC WXWIDGETS SUB CURL
'
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:
for t in ['dcpomatic', 'dcpomatic_batch', 'dcpomatic_server']:
obj = bld(features = 'cxx cxxprogram')
if not bld.env.DISABLE_GUI:
for t in ['dcpomatic', '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 = '
BOOST_THREAD BOOST_DATETIME OPENJPEG DCP CXML AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML WXWIDGETS SUB CURL
'
+ if bld.env.
BUILD_
STATIC:
obj.uselib += ' GTK'
obj.includes = ['..']
obj.uselib += ' GTK'
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 += ' ../../platform/windows/dcpomatic.rc'
obj.source = '%s.cc' % t
if bld.env.TARGET_WINDOWS:
obj.source += ' ../../platform/windows/dcpomatic.rc'
- obj.target = t
+ 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')