X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fwscript;h=7eeeecddfb80d48c909f290c7c14831cd79261e7;hb=6b0a17aa9e87e914666e696b251555b934cfb811;hp=06c712f0d10b671c516bb990ede15281d2bde2f8;hpb=2a40e1217349b02f798f86b62a269a81b43022cd;p=dcpomatic.git diff --git a/src/tools/wscript b/src/tools/wscript index 06c712f0d..7eeeecddf 100644 --- a/src/tools/wscript +++ b/src/tools/wscript @@ -30,18 +30,27 @@ def configure(conf): def build(bld): uselib = 'BOOST_THREAD BOOST_DATETIME DCP XMLSEC CXML XMLPP AVFORMAT AVFILTER AVCODEC ' uselib += 'AVUTIL SWSCALE SWRESAMPLE POSTPROC CURL BOOST_FILESYSTEM SSH ZIP CAIROMM FONTCONFIG PANGOMM SUB ' - uselib += 'SNDFILE SAMPLERATE BOOST_REGEX ICU NETTLE RTAUDIO PNG ' + uselib += 'SNDFILE SAMPLERATE BOOST_REGEX ICU NETTLE RTAUDIO PNG LEQM_NRT ' + + if bld.env.ENABLE_DISK: + if bld.env.TARGET_LINUX: + uselib += 'POLKIT ' + uselib += 'LWEXT4 NANOMSG ' if bld.env.TARGET_WINDOWS: uselib += 'WINSOCK2 DBGHELP SHLWAPI MSWSOCK BOOST_LOCALE WINSOCK2 OLE32 DSOUND WINMM KSUSER ' + if bld.env.TARGET_LINUX: + uselib += 'DL ' cli_tools = [] if bld.env.VARIANT == 'swaroop-theater': - cli_tools = ['dcpomatic_player', 'dcpomatic_playlist', 'dcpomatic_uuid'] - elif bld.env.VARIANT == "swaroop-studio": - cli_tools = ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm_cli', 'dcpomatic_create', 'dcpomatic_player', 'dcpomatic_playlist', 'dcpomatic_ecinema', 'dcpomatic_uuid'] + cli_tools = ['swaroop_dcpomatic_uuid'] + elif bld.env.VARIANT == 'swaroop-studio': + cli_tools = ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm_cli', 'dcpomatic_create', 'swaroop_dcpomatic_ecinema', 'swaroop_dcpomatic_uuid'] else: - cli_tools = ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm_cli', 'dcpomatic_create', 'dcpomatic_player'] + cli_tools = ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm_cli', 'dcpomatic_create'] + if bld.env.ENABLE_DISK: + cli_tools.append('dcpomatic_disk_writer') for t in cli_tools: obj = bld(features='cxx cxxprogram') @@ -49,16 +58,24 @@ def build(bld): obj.includes = ['..'] obj.use = ['libdcpomatic2'] obj.source = '%s.cc' % t - obj.target = t.replace('dcpomatic', 'dcpomatic2') + if bld.env.TARGET_WINDOWS and t == 'dcpomatic_disk_writer': + obj.source += ' ../../platform/windows/%s.rc' % t + # Prevent a console window opening when we start dcpomatic2_disk_writer + bld.env.LINKFLAGS.append('-Wl,-subsystem,windows') + obj.target = t.replace('dcpomatic', 'dcpomatic2').replace('swaroop_', '') if t == 'server_test': obj.install_path = None gui_tools = [] if not bld.env.DISABLE_GUI: if bld.env.VARIANT == 'swaroop-theater': - gui_tools = ['dcpomatic_player', 'dcpomatic_playlist'] + gui_tools = ['dcpomatic_player', 'swaroop_dcpomatic_playlist'] + elif bld.env.VARIANT == 'swaroop-studio': + gui_tools = ['dcpomatic', 'dcpomatic_batch', 'dcpomatic_server', 'dcpomatic_kdm', 'dcpomatic_player', 'swaroop_dcpomatic_playlist'] else: gui_tools = ['dcpomatic', 'dcpomatic_batch', 'dcpomatic_server', 'dcpomatic_kdm', 'dcpomatic_player', 'dcpomatic_playlist'] + if bld.env.ENABLE_DISK: + gui_tools.append('dcpomatic_disk') for t in gui_tools: obj = bld(features='cxx cxxprogram') @@ -68,12 +85,14 @@ def build(bld): obj.uselib += ' WXWIDGETS' if not bld.env.TARGET_OSX: obj.uselib += ' GL GLU' + if bld.env.TARGET_LINUX: + obj.uselib += ' X11' obj.includes = ['..'] obj.use = ['libdcpomatic2', 'libdcpomatic2-wx'] obj.source = '%s.cc' % t if bld.env.TARGET_WINDOWS: obj.source += ' ../../platform/windows/%s.rc' % t - obj.target = t.replace('dcpomatic', 'dcpomatic2') + obj.target = t.replace('dcpomatic', 'dcpomatic2').replace('swaroop_', '') i18n.po_to_mo(os.path.join('src', 'tools'), 'dcpomatic2', bld)