X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fwscript;h=bdf5cae81f4ab66a5ed5999f76f09f9f380d35bd;hb=88bb39c23e73041cdd7178414473a2223be277fa;hp=ffd77c6cb01483a5ec090bbe2c1b9842b93ab906;hpb=8a98116d95dc3efd372650b291b8c6fcc705fac9;p=dcpomatic.git diff --git a/src/tools/wscript b/src/tools/wscript index ffd77c6cb..bdf5cae81 100644 --- a/src/tools/wscript +++ b/src/tools/wscript @@ -27,14 +27,15 @@ def configure(conf): conf.env.append_value('LINKFLAGS', ['-mconsole']) def build(bld): - uselib = 'BOOST_THREAD BOOST_DATETIME OPENJPEG DCP XMLSEC CXML XMLPP AVFORMAT AVFILTER AVCODEC ' - uselib += 'AVUTIL SWSCALE POSTPROC CURL BOOST_FILESYSTEM SSH WXWIDGETS ZIP CAIROMM PANGOMM SUB MAGICK SNDFILE ' + uselib = 'BOOST_THREAD BOOST_DATETIME DCP XMLSEC CXML XMLPP AVFORMAT AVFILTER AVCODEC ' + uselib += 'AVUTIL SWSCALE POSTPROC CURL BOOST_FILESYSTEM SSH ZIP CAIROMM FONTCONFIG PANGOMM SUB MAGICK SNDFILE SAMPLERATE BOOST_REGEX ' + uselib += 'ICU ' if bld.env.TARGET_WINDOWS: uselib += 'WINSOCK2' - for t in ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm', 'dcpomatic_create']: - obj = bld(features = 'cxx cxxprogram') + for t in ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm_cli', 'dcpomatic_create']: + obj = bld(features='cxx cxxprogram') obj.uselib = uselib obj.includes = ['..'] obj.use = ['libdcpomatic2'] @@ -44,16 +45,17 @@ def build(bld): obj.install_path = None if not bld.env.DISABLE_GUI: - for t in ['dcpomatic', 'dcpomatic_batch', 'dcpomatic_server']: - obj = bld(features = 'cxx cxxprogram') + for t in ['dcpomatic', 'dcpomatic_batch', 'dcpomatic_server', 'dcpomatic_kdm']: + obj = bld(features='cxx cxxprogram') obj.uselib = uselib if bld.env.BUILD_STATIC or bld.env.TARGET_LINUX: obj.uselib += ' GTK' + obj.uselib += ' WXWIDGETS' obj.includes = ['..'] obj.use = ['libdcpomatic2', 'libdcpomatic2-wx'] obj.source = '%s.cc' % t if bld.env.TARGET_WINDOWS: - obj.source += ' ../../platform/windows/dcpomatic.rc' + obj.source += ' ../../platform/windows/%s.rc' % t obj.target = t.replace('dcpomatic', 'dcpomatic2') i18n.po_to_mo(os.path.join('src', 'tools'), 'dcpomatic2', bld)