diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-02-18 23:32:27 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-02-18 23:32:27 +0000 |
| commit | 1f6ce17f669a6d1d8e60cb7c31267c9b7aee808d (patch) | |
| tree | 3a7816ef966799ad0f39fed62ae4ddc319e6594a | |
| parent | 07f8ca1c6fb86fad8a6ba5bbf5f8ed8b74210579 (diff) | |
Bits to put playlist editor in the main distribution.
| -rwxr-xr-x | graphics/update | 2 | ||||
| -rw-r--r-- | platform/osx/wscript | 1 | ||||
| -rw-r--r-- | platform/windows/wscript | 2 | ||||
| -rw-r--r-- | src/tools/wscript | 2 |
4 files changed, 5 insertions, 2 deletions
diff --git a/graphics/update b/graphics/update index 42e8f5e8f..24c05a7aa 100755 --- a/graphics/update +++ b/graphics/update @@ -21,7 +21,7 @@ done if [ `uname -s` == "Darwin" ]; then # Convert OS X icons using OS X-only iconutil - for p in dcpomatic2 dcpomatic2_kdm dcpomatic2_server dcpomatic2_batch dcpomatic2_player; do + for p in dcpomatic2 dcpomatic2_kdm dcpomatic2_server dcpomatic2_batch dcpomatic2_player dcpomatic2_playlist; do iconutil --convert icns --output osx/$p.icns osx/$p.iconset done else diff --git a/platform/osx/wscript b/platform/osx/wscript index a34c21e2e..c1db9256b 100644 --- a/platform/osx/wscript +++ b/platform/osx/wscript @@ -4,3 +4,4 @@ def build(bld): obj = bld(features='subst', source='dcpomatic2_server.Info.plist.in', target='dcpomatic2_server.Info.plist', version=bld.env.VERSION) obj = bld(features='subst', source='dcpomatic2_batch.Info.plist.in', target='dcpomatic2_batch.Info.plist', version=bld.env.VERSION) obj = bld(features='subst', source='dcpomatic2_player.Info.plist.in', target='dcpomatic2_player.Info.plist', version=bld.env.VERSION) + obj = bld(features='subst', source='dcpomatic2_playlist.Info.plist.in', target='dcpomatic2_playlist.Info.plist', version=bld.env.VERSION) diff --git a/platform/windows/wscript b/platform/windows/wscript index 3b8892997..c08f2bf1e 100644 --- a/platform/windows/wscript +++ b/platform/windows/wscript @@ -327,6 +327,7 @@ File "%binaries%/src/tools/dcpomatic2_kdm_cli.exe" print(""" File "%binaries%/src/tools/dcpomatic2_player.exe" +File "%binaries%/src/tools/dcpomatic2_playlist.exe" """, file=f) if debug: @@ -345,6 +346,7 @@ File "%binaries%/src/tools/dcpomatic2_player.exe" print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2\\DCP-o-matic 2 KDM creator.lnk" "$INSTDIR\\bin\\dcpomatic2_kdm.exe"', file=f) print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2\\Uninstall DCP-o-matic 2.lnk" "$INSTDIR\\Uninstall.exe"', file=f) print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2\\DCP-o-matic 2 Player.lnk" "$INSTDIR\\bin\\dcpomatic2_player.exe"', file=f) + print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2\\DCP-o-matic 2 Playlist Editor.lnk" "$INSTDIR\\bin\\dcpomatic2_playlist.exe"', file=f) print('WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic2" "DisplayName" "DCP-o-matic 2 (remove only)"', file=f) print('WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic2" "UninstallString" "$INSTDIR\\Uninstall.exe"', file=f) diff --git a/src/tools/wscript b/src/tools/wscript index f45a42707..cc28abbe7 100644 --- a/src/tools/wscript +++ b/src/tools/wscript @@ -56,7 +56,7 @@ def build(bld): if bld.env.VARIANT == 'swaroop': gui_tools = ['dcpomatic_player', 'dcpomatic_playlist'] else: - gui_tools = ['dcpomatic', 'dcpomatic_batch', 'dcpomatic_server', 'dcpomatic_kdm', 'dcpomatic_player'] + gui_tools = ['dcpomatic', 'dcpomatic_batch', 'dcpomatic_server', 'dcpomatic_kdm', 'dcpomatic_player', 'dcpomatic_playlist'] for t in gui_tools: obj = bld(features='cxx cxxprogram') |