Bits to put playlist editor in the main distribution.

diff --git a/graphics/update b/graphics/update
index 42e8f5e8f59daca0e91d774aa57fc6ea0ed92535..24c05a7aa1861580f347b70f290063ac6f5f3562 100755 (executable)
--- 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 a34c21e2ed825d49cf791aab5a396fd477f8539a..c1db9256b0b8fc2033951b64c376d065badb8c05 100644 (file)
--- 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 3b8892997b2b61e5b74e7f6a2aabe2ea85abb745..c08f2bf1e75f340d6fab528636d98b32365461a7 100644 (file)
--- 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 f45a4270715ca8dde1ff706977243b3774c424ba..cc28abbe7a04b146d19b712d1c8b0232fdb1d094 100644 (file)
--- 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')