X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=platform%2Fwindows%2Fwscript;h=46974ed0f553c4dba607597a88f22b069255088d;hb=47d83b296248119d04b9226fd51a67e2fd3faac5;hp=9357e74ef5f95c742ee1747024e1da6d73efd217;hpb=19210abafb6e5963760951f8b115ac9ee69cfcf3;p=dcpomatic.git

diff --git a/platform/windows/wscript b/platform/windows/wscript
index 9357e74ef..46974ed0f 100644
--- a/platform/windows/wscript
+++ b/platform/windows/wscript
@@ -82,15 +82,11 @@ SetOutPath "$INSTDIR\\bin"
 WriteUninstaller "$INSTDIR\\Uninstall.exe"
 
 File "%static_deps%/bin/libintl-8.dll"
-File "%static_deps%/bin/libboost_chrono-mt.dll"
-File "%static_deps%/bin/libboost_filesystem-mt.dll"
-File "%static_deps%/bin/libboost_system-mt.dll"
-File "%static_deps%/bin/libboost_thread-mt.dll"
-File "%static_deps%/bin/libboost_date_time-mt.dll"
-File "%static_deps%/bin/libboost_locale-mt.dll"
-File "%static_deps%/bin/libboost_regex-mt.dll"
 """, file=f)
 
+    for lib in ['chrono', 'filesystem', 'system', 'thread', 'date_time', 'locale', 'regex']:
+        print('File "%%static_deps%%/bin/libboost_%s-mt-x%d.dll"' % (lib, bits), file=f)
+
     if bits == 32:
         print('File "%static_deps%/bin/libgcc_s_sjlj-1.dll"', file=f)
     else:
@@ -109,14 +105,14 @@ File "%static_deps%/bin/libssh.dll"
 File "%static_deps%/bin/libstdc++-6.dll"
 File "%static_deps%/bin/zlib1.dll"
 File "%static_deps%/bin/libjpeg-9.dll"
-File "%static_deps%/bin/wxbase30u_gcc_custom.dll"
-File "%static_deps%/bin/wxmsw30u_core_gcc_custom.dll"
-File "%static_deps%/bin/wxmsw30u_adv_gcc_custom.dll"
-File "%static_deps%/bin/wxmsw30u_richtext_gcc_custom.dll"
-File "%static_deps%/bin/wxmsw30u_html_gcc_custom.dll"
-File "%static_deps%/bin/wxmsw30u_gl_gcc_custom.dll"
-File "%static_deps%/bin/wxmsw30u_propgrid_gcc_custom.dll"
-File "%static_deps%/bin/wxbase30u_xml_gcc_custom.dll"
+File "%static_deps%/bin/wxbase314u_gcc_custom.dll"
+File "%static_deps%/bin/wxmsw314u_core_gcc_custom.dll"
+File "%static_deps%/bin/wxmsw314u_adv_gcc_custom.dll"
+File "%static_deps%/bin/wxmsw314u_richtext_gcc_custom.dll"
+File "%static_deps%/bin/wxmsw314u_html_gcc_custom.dll"
+File "%static_deps%/bin/wxmsw314u_gl_gcc_custom.dll"
+File "%static_deps%/bin/wxmsw314u_propgrid_gcc_custom.dll"
+File "%static_deps%/bin/wxbase314u_xml_gcc_custom.dll"
 File "%static_deps%/bin/libcairo-2.dll"
 File "%static_deps%/bin/libfreetype-6.dll"
 File "%static_deps%/bin/libgthread-2.0-0.dll"
@@ -143,19 +139,17 @@ File "%static_deps%/bin/libzip.dll"
 File "%static_deps%/bin/libcairomm-1.0-1.dll"
 File "%static_deps%/bin/libpangomm-1.4-1.dll"
 File "%static_deps%/bin/libsamplerate-0.dll"
-File "%static_deps%/bin/libnettle-7.dll"
-File "%static_deps%/bin/icuuc65.dll"
-File "%static_deps%/bin/icudt65.dll"
-File "%static_deps%/bin/icuin65.dll"
+File "%static_deps%/bin/libnettle-8.dll"
+File "%static_deps%/bin/icuuc66.dll"
+File "%static_deps%/bin/icudt66.dll"
+File "%static_deps%/bin/icuin66.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.dll"
-File "%static_deps%/bin/liblcms2-2.dll"
 File "%static_deps%/bin/libwinpthread-1.dll"
 File "%static_deps%/bin/libgnutls-30.dll"
 File "%static_deps%/bin/libgmp-10.dll"
-File "%static_deps%/bin/libhogweed-5.dll"
+File "%static_deps%/bin/libhogweed-6.dll"
 File "%static_deps%/bin/libidn2-0.dll"
 File "%static_deps%/bin/libunistring-2.dll"
 File "%static_deps%/bin/libssh2-1.dll"
@@ -164,12 +158,14 @@ File "%static_deps%/bin/libgpg-error-0.dll"
 File "%static_deps%/bin/libpangoft2-1.0-0.dll"
 File "%static_deps%/bin/libx264-155.dll"
 File "%static_deps%/bin/libwebp-7.dll"
+File "%static_deps%/bin/GLEW.dll"
+File "%static_deps%/bin/libdav1d.dll"
     """, file=f)
 
     if bits == 32:
-        print('File "%static_deps%/bin/libcrypto-1_1.dll"', file=f)
+        print('File "%static_deps%/bin/libcrypto-3.dll"', file=f)
     else:
-        print('File "%static_deps%/bin/libcrypto-1_1-x64.dll"', file=f)
+        print('File "%static_deps%/bin/libcrypto-3-x64.dll"', file=f)
 
     print("""
 File "%static_deps%/bin/libltdl-7.dll"
@@ -208,6 +204,9 @@ File "%cdist_deps%/bin/libopenjp2.dll"
         print('File "%resources%/gdb_script"', file=f)
         print('File "%resources%/dcpomatic2_debug.bat"', file=f)
         print('File "%mingw%/bin/gdb.exe"', file=f)
+        print('File "%static_deps%/bin/libtermcap.dll"', file=f)
+        print('File "%static_deps%/bin/libreadline8.dll"', file=f)
+        print('File "%static_deps%/bin/libmman.dll"', file=f)
         for s, l in tools:
             print('File "%%resources%%/dcpomatic2_%s_debug.bat"' % s, file=f)
     else:
@@ -336,6 +335,9 @@ File "%cdist_deps%/share/libdcp/tags/language"
 File "%cdist_deps%/share/libdcp/tags/region"
 File "%cdist_deps%/share/libdcp/tags/script"
 File "%cdist_deps%/share/libdcp/tags/variant"
+File "%cdist_deps%/share/libdcp/tags/dcnc"
+SetOutPath "$INSTDIR"
+File "%cdist_deps%/share/libdcp/ratings"
 
 SectionEnd
     """, file=f)