X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=platform%2Fwindows%2Fwscript;h=e02d4c09f452a3db34a42232138e34059d27f5fa;hb=bd5e8b83a3a18787241982efdae809d4db21f65d;hp=de249ca886f303248f5fc4bb15b3918a5e837159;hpb=bd7c31d625689ddb4a38b80f39b09728b149b861;p=dcpomatic.git

diff --git a/platform/windows/wscript b/platform/windows/wscript
index de249ca88..e02d4c09f 100644
--- a/platform/windows/wscript
+++ b/platform/windows/wscript
@@ -143,7 +143,7 @@ File "%static_deps%/bin/icuin56.dll"
 File "%static_deps%/bin/liblzma-5.dll"
 File "%static_deps%/bin/libpcre-1.dll"
 File "%static_deps%/bin/libharfbuzz-0.dll"
-File "%static_deps%/bin/libjasper-1.dll"
+File "%static_deps%/bin/libjasper.dll"
 File "%static_deps%/bin/liblcms2-2.dll"
 File "%static_deps%/bin/libwinpthread-1.dll"
 File "%static_deps%/bin/libgnutls-30.dll"
@@ -153,21 +153,28 @@ File "%static_deps%/bin/libidn2-0.dll"
 File "%static_deps%/bin/libunistring-2.dll"
 File "%static_deps%/bin/libssh2-1.dll"
 File "%static_deps%/bin/libgcrypt-20.dll"
-File "%static_deps%/bin/libgpg-error6-0.dll"
+""", file=f)
+
+    if bits == 32:
+        print('File "%static_deps%/bin/libgpg-error-0.dll"', file=f)
+    else:
+        print('File "%static_deps%/bin/libgpg-error6-0.dll"', file=f)
+
+    print("""
 File "%static_deps%/bin/libpangoft2-1.0-0.dll"
-File "%static_deps%/bin/libx264-148.dll"
+File "%static_deps%/bin/libx264-152.dll"
 
 File "%cdist_deps%/bin/asdcp-cth.dll"
 File "%cdist_deps%/bin/kumu-cth.dll"
-File "%cdist_deps%/bin/avcodec-57.dll"
-File "%cdist_deps%/bin/avfilter-6.dll"
-File "%cdist_deps%/bin/avformat-57.dll"
-File "%cdist_deps%/bin/avutil-55.dll"
-File "%cdist_deps%/bin/avdevice-57.dll"
-File "%cdist_deps%/bin/postproc-54.dll"
-File "%cdist_deps%/bin/swresample-2.dll"
+File "%cdist_deps%/bin/avcodec-58.dll"
+File "%cdist_deps%/bin/avfilter-7.dll"
+File "%cdist_deps%/bin/avformat-58.dll"
+File "%cdist_deps%/bin/avutil-56.dll"
+File "%cdist_deps%/bin/avdevice-58.dll"
+File "%cdist_deps%/bin/postproc-55.dll"
+File "%cdist_deps%/bin/swresample-3.dll"
 File "%cdist_deps%/bin/dcp-1.0.dll"
-File "%cdist_deps%/bin/swscale-4.dll"
+File "%cdist_deps%/bin/swscale-5.dll"
 File "%cdist_deps%/bin/cxml-0.dll"
 File "%cdist_deps%/bin/sub-1.0.dll"
 File "%cdist_deps%/bin/ffprobe.exe"
@@ -183,6 +190,7 @@ File "%cdist_deps%/bin/ffprobe.exe"
         print('File "%resources%/dcpomatic2_debug.bat"', file=f)
         print('File "%resources%/dcpomatic2_batch_debug.bat"', file=f)
         print('File "%resources%/dcpomatic2_kdm_debug.bat"', file=f)
+        print('File "%resources%/dcpomatic2_player_debug.bat"', file=f)
         print('File "%mingw%/gdb.exe"', file=f)
         print('File "%mingw%/addr2line.exe"', file=f)
     else:
@@ -268,6 +276,11 @@ File "%resources%/../../fonts/LiberationSans-Regular.ttf"
 File "%resources%/../../fonts/LiberationSans-Italic.ttf"
 File "%resources%/../../fonts/LiberationSans-Bold.ttf"
 File "%graphics%/splash.png"
+File "%graphics%/zoom.png"
+File "%graphics%/zoom_all.png"
+File "%graphics%/select.png"
+File "%graphics%/snap.png"
+File "%graphics%/sequence.png"
 
 SectionEnd
     """, file=f)
@@ -290,12 +303,14 @@ File "%binaries%/src/tools/dcpomatic2_batch.exe"
 File "%binaries%/src/tools/dcpomatic2_cli.exe"
 File "%binaries%/src/tools/dcpomatic2_create.exe"
 File "%binaries%/src/tools/dcpomatic2_kdm.exe"
+File "%binaries%/src/tools/dcpomatic2_player.exe"
     """, file=f)
 
     if debug:
         print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2 debug\\DCP-o-matic 2 debug.lnk" "$INSTDIR\\bin\\dcpomatic2_debug.bat"', file=f)
         print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2 debug\\DCP-o-matic 2 batch converter debug.lnk" "$INSTDIR\\bin\\dcpomatic2_batch_debug.bat" ""', file=f)
         print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2 debug\\DCP-o-matic 2 KDM creator debug.lnk" "$INSTDIR\\bin\\dcpomatic2_kdm_debug.bat" ""', file=f)
+        print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2 debug\\DCP-o-matic 2 Player debug.lnk" "$INSTDIR\\bin\\dcpomatic2_player_debug.bat" ""', file=f)
         print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2 debug\\Uninstall DCP-o-matic 2 debug.lnk" "$INSTDIR\\Uninstall.exe"', file=f)
         print('WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic 2 debug" "DisplayName" "DCP-o-matic 2 debug (remove only)"', file=f)
         print('WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic 2 debug" "UninstallString" "$INSTDIR\\Uninstall.exe"', file=f)
@@ -303,6 +318,7 @@ File "%binaries%/src/tools/dcpomatic2_kdm.exe"
         print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2\\DCP-o-matic 2.lnk" "$INSTDIR\\bin\\dcpomatic2.exe"', file=f)
         print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2\\DCP-o-matic 2 batch converter.lnk" "$INSTDIR\\bin\\dcpomatic2_batch.exe"', file=f)
         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\\DCP-o-matic 2 Player.lnk" "$INSTDIR\\bin\\dcpomatic2_player.exe"', file=f)
         print('CreateShortCut "$SMPROGRAMS\\DCP-o-matic 2\\Uninstall DCP-o-matic 2.lnk" "$INSTDIR\\Uninstall.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)
@@ -314,11 +330,13 @@ File "%binaries%/src/tools/dcpomatic2_kdm.exe"
         print('CreateShortCut "$DESKTOP\\DCP-o-matic 2 debug.lnk" "$INSTDIR\\bin\\dcpomatic2_debug.bat" ""', file=f)
         print('CreateShortCut "$DESKTOP\\DCP-o-matic 2 batch converter debug.lnk" "$INSTDIR\\bin\\dcpomatic2_batch_debug.bat" ""', file=f)
         print('CreateShortCut "$DESKTOP\\DCP-o-matic 2 KDM creator debug.lnk" "$INSTDIR\\bin\\dcpomatic2_kdm_debug.bat" ""', file=f)
+        print('CreateShortCut "$DESKTOP\\DCP-o-matic 2 Player debug.lnk" "$INSTDIR\\bin\\dcpomatic2_player_debug.bat" ""', file=f)
     else:
         print('Section "DCP-o-matic 2 desktop shortcuts" SEC_MASTER_DESKTOP', file=f)
         print('CreateShortCut "$DESKTOP\\DCP-o-matic 2.lnk" "$INSTDIR\\bin\\dcpomatic2.exe" ""', file=f)
         print('CreateShortCut "$DESKTOP\\DCP-o-matic 2 batch converter.lnk" "$INSTDIR\\bin\\dcpomatic2_batch.exe"', file=f)
         print('CreateShortCut "$DESKTOP\\DCP-o-matic 2 KDM creator.lnk" "$INSTDIR\\bin\\dcpomatic2_kdm.exe"', file=f)
+        print('CreateShortCut "$DESKTOP\\DCP-o-matic 2 Player.lnk" "$INSTDIR\\bin\\dcpomatic2_player.exe"', file=f)
 
     print("SectionEnd", file=f)